diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-23 09:07:15 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-23 09:07:15 +0000 |
| commit | 678cc132f942ff4d84a803550eedf96acc543bca (patch) | |
| tree | eb195abafaf69d55fa0f4b77323e517fcd2263cd /cmake/src/lib/JEDI-SDL/SDL | |
| parent | 7e677fd5ebe60c3dd9df8954e1ed28c4afdf8660 (diff) | |
| download | usdx-678cc132f942ff4d84a803550eedf96acc543bca.tar.gz usdx-678cc132f942ff4d84a803550eedf96acc543bca.tar.xz usdx-678cc132f942ff4d84a803550eedf96acc543bca.zip | |
update to trunk rev. 2391
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2401 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'cmake/src/lib/JEDI-SDL/SDL')
| -rw-r--r-- | cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc | 8 | ||||
| -rw-r--r-- | cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas | 2 | ||||
| -rw-r--r-- | cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc b/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc index fed972b5..31817d24 100644 --- a/cmake/src/lib/JEDI-SDL/SDL/Pas/jedi-sdl.inc +++ b/cmake/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/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas b/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas index ea4f220c..796aa0ab 100644 --- a/cmake/src/lib/JEDI-SDL/SDL/Pas/moduleloader.pas +++ b/cmake/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/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas b/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas index 0d7e46af..736009c2 100644 --- a/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas +++ b/cmake/src/lib/JEDI-SDL/SDL/Pas/sdl.pas @@ -370,7 +370,7 @@ const {$IFDEF DARWIN} SDLLibName = 'libSDL-1.2.0.dylib'; {$linklib libSDL-1.2.0} - {$linklib gcc} +// {$linklib gcc} {$linklib SDLmain} {$linkframework Cocoa} {$PASCALMAINNAME SDL_main} |