diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-02-06 22:26:12 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-02-06 22:26:12 +0000 |
| commit | 01e5e1f0a2d19c051106669cc8df5da2d1cffbe2 (patch) | |
| tree | 1815772c338e506002ce068ded1613c77e426a84 /src/lib/JEDI-SDL/SDL | |
| parent | ca4174bf978fc74150b6b619bbb68ae3d53e4f2c (diff) | |
| download | usdx-01e5e1f0a2d19c051106669cc8df5da2d1cffbe2.tar.gz usdx-01e5e1f0a2d19c051106669cc8df5da2d1cffbe2.tar.xz usdx-01e5e1f0a2d19c051106669cc8df5da2d1cffbe2.zip | |
replace ifdef win32 by ifdef mswindows for win64 compilation. please test.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2098 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/JEDI-SDL/SDL')
| -rw-r--r-- | src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc | 8 | ||||
| -rw-r--r-- | src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas | 2 | ||||
| -rw-r--r-- | src/lib/JEDI-SDL/SDL/Pas/sdl.pas | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc b/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc index fed972b5..31817d24 100644 --- a/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc +++ b/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc @@ -332,7 +332,7 @@ {$ELSE} {$DEFINE __OS_DOS__} {$ENDIF} - {$IFDEF WIN32} + {$IFDEF MSWINDOWS} {$DEFINE UseWin} {$ENDIF} {$DEFINE HAS_TYPES} @@ -380,13 +380,13 @@ {$OA+} // Objects and structures align {$ENDIF} -{$IFDEF Win32} +{$IFDEF MSWINDOWS} {$DEFINE OS_BigMem} -{$ELSE Win32} +{$ELSE MSWINDOWS} {$IFDEF ver70} {$DEFINE assembler} {$ENDIF} { use 16-bit assembler! } -{$ENDIF Win32} +{$ENDIF MSWINDOWS} { ************************** dos/dos-like platforms **************} {$IFDEF Windows} diff --git a/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas b/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas index ea4f220c..796aa0ab 100644 --- a/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas +++ b/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas @@ -59,7 +59,7 @@ interface // each OS gets its own IFDEFed complete code block to make reading easier -{$IFDEF WIN32} +{$IFDEF MSWINDOWS} uses Windows; diff --git a/src/lib/JEDI-SDL/SDL/Pas/sdl.pas b/src/lib/JEDI-SDL/SDL/Pas/sdl.pas index 0d7e46af..6a9ad14b 100644 --- a/src/lib/JEDI-SDL/SDL/Pas/sdl.pas +++ b/src/lib/JEDI-SDL/SDL/Pas/sdl.pas @@ -367,10 +367,13 @@ const {$ENDIF} {$IFDEF UNIX} +{$macro on} +{$IF (6 <= 6)} +{$ENDIF} {$IFDEF DARWIN} SDLLibName = 'libSDL-1.2.0.dylib'; {$linklib libSDL-1.2.0} - {$linklib gcc} +// {$linklib gcc} {$linklib SDLmain} {$linkframework Cocoa} {$PASCALMAINNAME SDL_main} |