Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix that nasty "Pascal Internal Error" when compiling
authorkoda
Sat, 10 Oct 2009 14:26:50 +0000
changeset 2413 d921d13a8546
parent 2412 8f48a9181f99
child 2414 fd9ca82077d8
fix that nasty "Pascal Internal Error" when compiling
CMakeLists.txt file | annotate | diff | comparison | revisions
hedgewars/CMakeLists.txt file | annotate | diff | comparison | revisions
hedgewars/hwengine.pas file | annotate | diff | comparison | revisions
hedgewars/uSound.pas file | annotate | diff | comparison | revisions
hedgewars/uWorld.pas file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Sat Oct 10 14:24:39 2009 +0000
+++ b/CMakeLists.txt	Sat Oct 10 14:26:50 2009 +0000
@@ -71,7 +71,7 @@
 set(CMAKE_C_FLAGS_RELEASE "-w -O2 -fomit-frame-pointer")
 set(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 if(APPLE AND NOT universal_build)
-	set(CMAKE_C_FLAGS_RELEASE "-sse2 ${CMAKE_C_FLAGS_RELEASE}")
+	set(CMAKE_C_FLAGS_RELEASE "-msse2 ${CMAKE_C_FLAGS_RELEASE}")
 endif()
 set(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
 set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
--- a/hedgewars/CMakeLists.txt	Sat Oct 10 14:24:39 2009 +0000
+++ b/hedgewars/CMakeLists.txt	Sat Oct 10 14:26:50 2009 +0000
@@ -92,12 +92,12 @@
 
 
 #PASCAL FLAG SECTION
-set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" "-fPIC" ${hwengine_project})
+set(pascal_compiler_flags ${noexecstack_flags} "-B" "-FE../bin" "-Fl../bin/" "-Cs2000000" "-vwi" ${hwengine_project})
 
 if(OPTIMIZATIONS)
 	set(pascal_compiler_flags "-O2" "-Xs" "-Nu" ${pascal_compiler_flags})
 	if(APPLE AND NOT universal_build)
-		set(pascal_compiler_flags "-CfSSE2" ${pascal_compiler_flags})	#instruction set for ppc is 7400
+		set(pascal_compiler_flags "-fPIC" "-CfSSE2" ${pascal_compiler_flags})	#instruction set for ppc is 7400
 	endif()			
 else(OPTIMIZATIONS)
 	set(pascal_compiler_flags "-O-" "-gl" "-dDEBUGFILE" "-pg" "-va" ${pascal_compiler_flags})
--- a/hedgewars/hwengine.pas	Sat Oct 10 14:24:39 2009 +0000
+++ b/hedgewars/hwengine.pas	Sat Oct 10 14:26:50 2009 +0000
@@ -237,7 +237,7 @@
      val(ParamStr(5), ipcPort);
      cFullScreen:= ParamStr(6) = '1';
      isSoundEnabled:= ParamStr(7) = '1';
-	 isSoundHardware:= ParamStr(8) = '1';
+     isSoundHardware:= ParamStr(8) = '1';
      cLocaleFName:= ParamStr(9);
      val(ParamStr(10), cInitVolume);
      val(ParamStr(11), cTimerInterval);
--- a/hedgewars/uSound.pas	Sat Oct 10 14:24:39 2009 +0000
+++ b/hedgewars/uSound.pas	Sat Oct 10 14:26:50 2009 +0000
@@ -53,13 +53,13 @@
 procedure PauseMusic;
 procedure ResumeMusic;
 procedure StopSound(snd: TSound);
-function  ChangeVolume(voldelta: LongInt): LongInt;
-function  AskForVoicepack(name: shortstring): PVoicepack;
-function  soundFadeOut(snd: TSound; qt: LongInt; voicepack: PVoicepack): LongInt;
 
+function ChangeVolume(voldelta: LongInt): LongInt;
+function AskForVoicepack(name: shortstring): PVoicepack;
+function soundFadeOut(snd: TSound; qt: LongInt; voicepack: PVoicepack): LongInt;
 
 {*remember: LongInt = 32bit; integer = 16bit; byte = 8bit*}
-function openal_init		(hardware: LongInt; memsize: LongInt): boolean; cdecl; external OpenALBridge;
+function openal_init		(hardware: LongInt; memsize: LongInt)	: boolean; cdecl; external OpenALBridge;
 function openal_close							: boolean; cdecl; external OpenALBridge;
 function openal_loadfile	(const filename: PChar)			: LongInt; cdecl; external OpenALBridge;
 function openal_toggleloop	(index: LongInt)			: boolean; cdecl; external OpenALBridge;
@@ -67,7 +67,8 @@
 function openal_setglobalvolume	(percentage: byte)			: boolean; cdecl; external OpenALBridge;
 function openal_fadeout		(index: LongInt; quantity: SmallInt)	: boolean; cdecl; external OpenALBridge;
 function openal_fadein		(index: LongInt; quantity: SmallInt)	: boolean; cdecl; external OpenALBridge;
-function openal_fade		(index: LongInt; quantity: SmallInt; direction: boolean)	: boolean; cdecl; external OpenALBridge;
+function openal_fade		(index: LongInt; quantity: SmallInt;
+				 direction: boolean)			: boolean; cdecl; external OpenALBridge;
 function openal_playsound	(index: LongInt)			: boolean; cdecl; external OpenALBridge;
 function openal_pausesound	(index: LongInt)			: boolean; cdecl; external OpenALBridge;
 function openal_stopsound	(index: LongInt)			: boolean; cdecl; external OpenALBridge;
--- a/hedgewars/uWorld.pas	Sat Oct 10 14:24:39 2009 +0000
+++ b/hedgewars/uWorld.pas	Sat Oct 10 14:26:50 2009 +0000
@@ -32,11 +32,7 @@
 {$ENDIF}
 var FollowGear: PGear = nil;
 	WindBarWidth: LongInt = 0;
-{$IFDEF IPHONEOS}
-	bShowAmmoMenu: boolean = true;
-{$ELSE}
        	bShowAmmoMenu: boolean = false;
-{$ENDIF}
 	bSelected: boolean = false;
 	bShowFinger: boolean = false;
 	Frames: Longword = 0;
hedgewars