completes removal of wav files, updates SDLh and adds DEBUGFILE to hwengine when compiled in Debug mode
--- a/hedgewars/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/hedgewars/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -88,10 +88,10 @@
message("Minimum required version of FreePascal is 2.2.0")
else (fpc_ver LESS "020200")
set(pascal_compiler ${fpc_executable})
- if( NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "Release")
+ if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "Release")
set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" "-O2" "-Xs" ${hwengine_project})
else()
- set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" "-O-" "-gl" ${hwengine_project})
+ set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" "-O-" "-gl" "-dDEBUGFILE" ${hwengine_project})
endif()
endif (fpc_ver LESS "020200")
endif (fpc_version)
--- a/hedgewars/SDLh.pas Tue Jul 07 21:48:55 2009 +0000
+++ b/hedgewars/SDLh.pas Tue Jul 07 22:02:13 2009 +0000
@@ -19,10 +19,7 @@
unit SDLh;
interface
-{$IFDEF LINUX}
-{$DEFINE UNIX}
-{$ENDIF}
-{$IFDEF FREEBSD}
+{$IFDEF LINUX or FREEBSD}
{$DEFINE UNIX}
{$ENDIF}
@@ -54,11 +51,11 @@
SDLLibName = 'SDL.dll';
{$ENDIF}
{$IFDEF UNIX}
- {$IFDEF DARWIN}
- SDLLibName = 'SDL';
- {$ELSE}
- SDLLibName = 'libSDL.so';
- {$ENDIF}
+ {$IFDEF DARWIN}
+ SDLLibName = 'SDL';
+ {$ELSE}
+ SDLLibName = 'libSDL.so';
+ {$ENDIF}
{$ENDIF}
SDL_SWSURFACE = $00000000;
SDL_HWSURFACE = $00000001;
@@ -66,21 +63,21 @@
SDL_INIT_VIDEO = $00000020;
SDL_INIT_AUDIO = $00000010;
- {$IFDEF SDL13}
- SDL_ASYNCBLIT = $08000000;
- SDL_ANYFORMAT = $10000000;
+{$IFDEF SDL13}
+ SDL_ASYNCBLIT = $08000000;
+ SDL_ANYFORMAT = $10000000;
SDL_HWPALETTE = $00200000;
SDL_DOUBLEBUF = $00400000;
SDL_FULLSCREEN = $00800000;
SDL_HWACCEL = $08000000;
SDL_SRCCOLORKEY = $00020000;
SDL_RLEACCEL = $08000000;
- SDL_NOFRAME = $02000000;
- SDL_OPENGL = $04000000;
+ SDL_NOFRAME = $02000000;
+ SDL_OPENGL = $04000000;
SDL_RESIZABLE = $01000000;
- {$ELSE}
- SDL_ASYNCBLIT = $00000004;
- SDL_ANYFORMAT = $00100000;
+{$ELSE}
+ SDL_ASYNCBLIT = $00000004;
+ SDL_ANYFORMAT = $00100000;
SDL_HWPALETTE = $20000000;
SDL_DOUBLEBUF = $40000000;
SDL_FULLSCREEN = $80000000;
@@ -88,9 +85,9 @@
SDL_SRCCOLORKEY = $00001000;
SDL_RLEACCEL = $00004000;
SDL_NOFRAME = $00000020;
- SDL_OPENGL = $00000002;
+ SDL_OPENGL = $00000002;
SDL_RESIZABLE = $00000010;
- {$ENDIF}
+{$ENDIF}
SDL_NOEVENT = 0;
SDL_ACTIVEEVENT = 1;
@@ -305,11 +302,11 @@
SDL_TTFLibName = 'SDL_ttf.dll';
{$ENDIF}
{$IFDEF UNIX}
- {$IFDEF DARWIN}
- SDL_TTFLibName = 'SDL_ttf';
- {$ELSE}
- SDL_TTFLibName = 'libSDL_ttf.so';
- {$ENDIF}
+ {$IFDEF DARWIN}
+ SDL_TTFLibName = 'SDL_ttf';
+ {$ELSE}
+ SDL_TTFLibName = 'libSDL_ttf.so';
+ {$ENDIF}
{$ENDIF}
TTF_STYLE_NORMAL = 0;
TTF_STYLE_BOLD = 1;
@@ -340,11 +337,11 @@
SDL_ImageLibName = 'SDL_image.dll';
{$ENDIF}
{$IFDEF UNIX}
- {$IFDEF DARWIN}
- SDL_ImageLibName = 'SDL_image';
- {$ELSE}
- SDL_ImageLibName = 'libSDL_image.so';
- {$ENDIF}
+ {$IFDEF DARWIN}
+ SDL_ImageLibName = 'SDL_image';
+ {$ELSE}
+ SDL_ImageLibName = 'libSDL_image.so';
+ {$ENDIF}
{$ENDIF}
function IMG_Load(const _file: PChar): PSDL_Surface; cdecl; external SDL_ImageLibName;
@@ -355,11 +352,11 @@
SDL_NetLibName = 'SDL_net.dll';
{$ENDIF}
{$IFDEF UNIX}
- {$IFDEF DARWIN}
- SDL_NetLibName = 'SDL_net';
- {$ELSE}
- SDL_NetLibName = 'libSDL_net.so';
- {$ENDIF}
+ {$IFDEF DARWIN}
+ SDL_NetLibName = 'SDL_net';
+ {$ELSE}
+ SDL_NetLibName = 'libSDL_net.so';
+ {$ENDIF}
{$ENDIF}
type TIPAddress = record
@@ -438,3 +435,4 @@
end;
end.
+
--- a/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Default/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB BaseSounds *.ogg *.wav)
+file(GLOB BaseSounds *.ogg)
install(FILES
${BaseSounds}
--- a/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Mobster/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB MobsterSounds *.ogg *.wav)
+file(GLOB MobsterSounds *.ogg)
install(FILES
${MobsterSounds}
--- a/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Pirate/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB PirateSounds *.ogg *.wav)
+file(GLOB PirateSounds *.ogg)
install(FILES
${PirateSounds}
--- a/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Robot/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB RobotSounds *.ogg *.wav)
+file(GLOB RobotSounds *.ogg)
install(FILES
${RobotSounds}
--- a/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Russian/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB RussianSounds *.ogg *.wav)
+file(GLOB RussianSounds *.ogg)
install(FILES
${RussianSounds}
--- a/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Singer/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB SingerSounds *.ogg *.wav)
+file(GLOB SingerSounds *.ogg)
install(FILES
${SingerSounds}
--- a/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt Tue Jul 07 21:48:55 2009 +0000
+++ b/share/hedgewars/Data/Sounds/voices/Surfer/CMakeLists.txt Tue Jul 07 22:02:13 2009 +0000
@@ -1,4 +1,4 @@
-file(GLOB SurferSounds *.ogg *.wav)
+file(GLOB SurferSounds *.ogg)
install(FILES
${SurferSounds}