Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do parts of the proposed changes in "[Warzone-dev] build issues in FreeBSD system" by Yaroslav Kolomiyets from 24.10.2006: 

- SDL header includes don't use SDL/ anymore (raw Makefiles and MSVC Project adapted).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2863 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-11-24 11:49:51 +00:00
parent 6ffdcc0bb5
commit 9cc0a628c1
23 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/SDL_framerate.h
View File

@ -17,7 +17,7 @@ extern "C" {
/* --- */
#include "SDL/SDL.h"
#include <SDL.h>
/* --------- Definitions */

2
lib/framework/frame.c
View File

@ -33,7 +33,7 @@
#include <stdio.h>
#include <time.h>
#include <string.h>
#include <SDL/SDL.h>
#include <SDL.h>
#include <physfs.h>
// window focus messages

1
lib/framework/input.c
View File

@ -27,7 +27,6 @@
#include <stdio.h>
#include <string.h>
#include <SDL/SDL.h>
/* Allow frame header files to be singly included */
#define FRAME_LIB_INCLUDE

2
lib/framework/input.h
View File

@ -30,7 +30,7 @@
#error Framework header files MUST be included from Frame.h ONLY.
#endif
#include <SDL/SDL.h>
#include <SDL.h>
#include "types.h"
/* The defines for all the key codes */

2
lib/framework/types.h
View File

@ -35,7 +35,7 @@
#include "wzglobal.h"
// Defines C99 types for C99 incompatible compilers (e.g. MSVC)
#include <SDL/SDL_types.h>
#include <SDL_types.h>
#include <limits.h>

2
lib/gamelib/gtime.c
View File

@ -24,7 +24,7 @@
*
*/
#include "SDL/SDL_timer.h"
#include <SDL_timer.h>
#include <time.h>

2
lib/ivis_opengl/pieblitfunc.c
View File

@ -29,7 +29,7 @@
#include "lib/framework/frame.h"
#include <time.h>
#include <SDL/SDL_opengl.h>
#include <SDL_opengl.h>
#include "lib/ivis_common/pieblitfunc.h"
#include "lib/ivis_common/piedef.h"

4
lib/ivis_opengl/piedraw.c
View File

@ -27,8 +27,8 @@
/***************************************************************************/
#include <string.h>
#include <SDL/SDL_opengl.h>
#include <SDL/SDL_video.h>
#include <SDL_opengl.h>
#include <SDL_video.h>
#include "lib/framework/frame.h"
#include "lib/ivis_common/ivisdef.h"

2
lib/ivis_opengl/piefunc.c
View File

@ -28,7 +28,7 @@
#include "lib/framework/frame.h"
#include <SDL/SDL_opengl.h>
#include <SDL_opengl.h>
#include "lib/gamelib/gtime.h"
#include "lib/ivis_common/piedef.h"

2
lib/ivis_opengl/piematrix.c
View File

@ -28,7 +28,7 @@
#include "lib/framework/frame.h"
#include <SDL/SDL_opengl.h>
#include <SDL_opengl.h>
#include "lib/ivis_common/piedef.h"
#include "lib/ivis_common/pieclip.h"

4
lib/ivis_opengl/piemode.c
View File

@ -28,8 +28,8 @@
#include "lib/framework/frame.h"
#include <SDL/SDL.h>
#include <SDL/SDL_opengl.h>
#include <SDL.h>
#include <SDL_opengl.h>
#include "lib/ivis_common/piedef.h"
#include "lib/ivis_common/piestate.h"

4
lib/ivis_opengl/piestate.c
View File

@ -28,8 +28,8 @@
#include "lib/framework/frame.h"
#include <SDL/SDL.h>
#include <SDL/SDL_opengl.h>
#include <SDL.h>
#include <SDL_opengl.h>
#include "lib/ivis_common/piestate.h"
#include "lib/ivis_common/piedef.h"

4
lib/ivis_opengl/screen.c
View File

@ -26,8 +26,8 @@
#include "lib/framework/frame.h"
#include <SDL/SDL.h>
#include <SDL/SDL_opengl.h>
#include <SDL.h>
#include <SDL_opengl.h>
#include <physfs.h>
#include <png.h>
#include "lib/ivis_common/png_util.h"

2
lib/ivis_opengl/tex.c
View File

@ -19,7 +19,7 @@
*/
#include "lib/framework/frame.h"
#include <SDL/SDL_opengl.h>
#include <SDL_opengl.h>
#ifdef __APPLE__
#include <opengl/glu.h>
#else

4
lib/netplay/netplay.c
View File

@ -28,11 +28,11 @@
#include "lib/framework/frame.h"
#include <time.h> // for stats
#include <SDL/SDL_thread.h>
#include <SDL_thread.h>
#ifdef WZ_OS_MAC
#include <SDL_net/SDL_net.h>
#else
#include <SDL/SDL_net.h>
#include <SDL_net.h>
#endif
#include <physfs.h>
#include <string.h>

4
lib/widget/scrap.c
View File

@ -25,8 +25,8 @@
#include <limits.h>
#include <string.h>
#include <SDL/SDL.h>
#include <SDL/SDL_syswm.h>
#include <SDL.h>
#include <SDL_syswm.h>
#include "lib/framework/frame.h"
#include "scrap.h"

2
makerules/configure.mk
View File

@ -50,7 +50,7 @@ endif
# Setup paths and static values
CFLAGS+=-DVERSION=\"$(VERSION)\" -DYY_STATIC -DLOCALEDIR=\"$(LOCALEDIR)\" -DPACKAGE=\"$(PACKAGE)\" -I.. -I../.. -I$(DEVDIR)/include
CFLAGS+=-DVERSION=\"$(VERSION)\" -DYY_STATIC -DLOCALEDIR=\"$(LOCALEDIR)\" -DPACKAGE=\"$(PACKAGE)\" -I.. -I../.. -I$(DEVDIR)/include -I$(DEVDIR)/include/SDL
LDFLAGS+=-L$(DEVDIR)/lib

2
src/keyedit.c
View File

@ -26,7 +26,7 @@
// ////////////////////////////////////////////////////////////////////////////
// includes
#include <string.h>
#include <SDL/SDL.h>
#include <SDL.h>
#include <physfs.h>
#include "lib/framework/frame.h"

2
src/main.c
View File

@ -25,7 +25,7 @@
// Get platform defines before checking for them!
#include "lib/framework/frame.h"
#include <SDL/SDL.h>
#include <SDL.h>
#include <physfs.h>
/* For SHGetFolderPath */

2
src/multiint.c
View File

@ -27,7 +27,7 @@
#include "lib/framework/frame.h"
#include <SDL/SDL_opengl.h>
#include <SDL_opengl.h>
#include "lib/framework/frameresource.h"
#include "lib/framework/frameint.h"

2
src/seqdisp.c
View File

@ -24,7 +24,7 @@
*
*/
#include <string.h>
#include <SDL/SDL_timer.h>
#include <SDL_timer.h>
#include <physfs.h>
#include "lib/framework/frame.h"

2
src/texture.c
View File

@ -33,7 +33,7 @@
#include "radar.h"
#include <physfs.h>
#include <SDL/SDL_opengl.h>
#include <SDL_opengl.h>
#ifdef __APPLE__
#include <opengl/glu.h>
#else

4
win32/Warzone2100.vcproj
View File

@ -52,7 +52,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..&quot;;&quot;__DEVPKG__\include&quot;"
AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..&quot;;&quot;__DEVPKG__\include&quot;;&quot;__DEVPKG__\include\SDL&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;YY_NO_UNISTD_H;VERSION=\&quot;TRUNK\&quot;;PACKAGE=\&quot;warzone2100\&quot;;LOCALEDIR=\&quot;\&quot;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -139,7 +139,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..&quot;;&quot;__DEVPKG__\include&quot;"
AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)\..&quot;;&quot;__DEVPKG__\include&quot;;&quot;__DEVPKG__\include\SDL&quot;"
PreprocessorDefinitions="WIN32;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;YY_NO_UNISTD_H;VERSION=\&quot;TRUNK\&quot;;PACKAGE=\&quot;warzone2100\&quot;;LOCALEDIR=\&quot;\&quot;"
RuntimeLibrary="2"
UsePrecompiledHeader="0"