patch by koda
authorunc0rr
Tue, 07 Apr 2009 14:01:46 +0000
changeset 1947 9b8bdee5db6c
parent 1946 80030efe89fc
child 1948 1e0e1f03180d
patch by koda
hedgewars/SDLh.pas
hedgewars/hwengine.dpr
--- a/hedgewars/SDLh.pas	Sun Apr 05 17:48:48 2009 +0000
+++ b/hedgewars/SDLh.pas	Tue Apr 07 14:01:46 2009 +0000
@@ -36,23 +36,18 @@
 {$PACKRECORDS C}
 
 {$IFDEF DARWIN}
+	  {$PASCALMAINNAME SDL_main}
 {$IFNDEF IPHONE}
-{$linklib libpng}
-{$linklib libz}
-{$linklib libjpeg}
-{$linklib libtiff}
-{$linklib libfreetype}
-{$linklib libsmpeg}
-{$linklib libvorbis}
-{$linklib libvorbisfile}
-{$linklib libogg}
-
-{$linkframework Carbon}
-{$linkframework OpenGL}
-{$linkframework AudioUnit}
-{$linkframework Quicktime}
-{$linkframework IOKit}
-{add ForceFeedback and CoreAudio frameworks when you use SDL-1.3}
+	  {$linkframework Cocoa}
+	  {$linkframework SDL}
+	  {$linkframework SDL_mixer}
+	  {$linkframework SDL_net}
+	  {$linkframework SDL_image}
+	  {$linkframework SDL_ttf}
+	  {$linkframework Vorbis}
+	  {$linkframework Ogg}
+	  {$linklib SDLmain}
+	  {$linklib gcc}
 {$ENDIF}
 {$ENDIF}
 
@@ -63,15 +58,6 @@
       {$IFDEF UNIX}
 	{$IFDEF DARWIN}
 	  SDLLibName = 'libSDL.a';
-{$IFNDEF IPHONE}
-	  {$linklib libSDL}
-	  {$linklib SDLmain}
-	  {$linkframework Cocoa}
-{$ENDIF}
-	  {$PASCALMAINNAME SDL_main}
-{$IFNDEF IPHONE}
-	  {$linklib gcc}
-{$ENDIF}
 	{$ELSE}
           SDLLibName = 'libSDL.so';
         {$ENDIF}
@@ -303,9 +289,6 @@
       {$IFDEF UNIX}
 	{$IFDEF DARWIN}
 	  SDL_TTFLibName = 'libSDL_ttf.a';
-{$IFNDEF IPHONE}
-	  {$linklib libSDL_ttf}
-{$ENDIF}
 	{$ELSE}
           SDL_TTFLibName = 'libSDL_ttf.so';
         {$ENDIF}
@@ -340,9 +323,6 @@
       {$IFDEF UNIX}
 	{$IFDEF DARWIN}
 	  SDL_MixerLibName = 'libSDL_mixer.a';
-{$IFNDEF IPHONE}
-	  {$linklib libSDL_mixer}
-{$ENDIF}
 	{$ELSE}
           SDL_MixerLibName = 'libSDL_mixer.so';
 	{$ENDIF}
@@ -408,9 +388,6 @@
       {$IFDEF UNIX}
 	{$IFDEF DARWIN}
 	  SDL_ImageLibName = 'libSDL_image.a';
-{$IFNDEF IPHONE}
-	  {$linklib libSDL_image}
-{$ENDIF}
 	{$ELSE}
            SDL_ImageLibName = 'libSDL_image.so';
 	{$ENDIF}
@@ -426,9 +403,6 @@
       {$IFDEF UNIX}
 	{$IFDEF DARWIN}
 	  SDL_NetLibName = 'libSDL_net.a';
-{$IFNDEF IPHONE}
-	  {$linklib libSDL_net}
-{$ENDIF}
 	{$ELSE}
           SDL_NetLibName = 'libSDL_net.so';
 	{$ENDIF}
--- a/hedgewars/hwengine.dpr	Sun Apr 05 17:48:48 2009 +0000
+++ b/hedgewars/hwengine.dpr	Tue Apr 07 14:01:46 2009 +0000
@@ -20,9 +20,17 @@
 WriteLn('Only Freepascal supported');
 {$ENDIF}
 
+// Add all your Pascal units to the "uses" clause below to add them to the program.
+
+// Mark all Pascal procedures/functions that you wish to call from C/C++/Objective-C code using
+// "cdecl; export;" (see the fpclogo.pas unit for an example), and then add C-declarations for
+// these procedures/functions to the PascalImports.h file (also in the "Pascal Sources" group)
+// to make these functions available in the C/C++/Objective-C source files
+// (add "#include PascalImports.h" near the top of these files if it's not there yet)
+//Library PascalLibrary;
 program hwengine;
 uses
-	SDLh,
+	SDLh in 'SDLh.pas',
 {$IFDEF IPHONE}
 	gles11,
 {$ELSE}
@@ -329,7 +337,7 @@
 WriteLnToConsole('   -= by unC0Rr =-   ');
 GetParams;
 Randomize;
-
+{ /home/nemo/games/bin/hwengine /home/nemo/games/hedgewars/Data ~/.hedgewars/Saves/2009-03-22_19-54.hws_24 480 320 32 0 1 en.txt 128 33 0 1 1 0}
 if GameType = gmtLandPreview then GenLandPreview
                              else Game
 end.