diff options
author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-08-06 19:02:56 +0000 |
---|---|---|
committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-08-06 19:02:56 +0000 |
commit | 57247ddc701c856e3bd0811566405ab4ac69e9ff (patch) | |
tree | fb90625caf573a20f65354ade1023ecb396c8456 /Game/Code/UltraStar.dpr | |
parent | c9f0475aa950753f91fddf36f94d488e554d3757 (diff) | |
download | usdx-57247ddc701c856e3bd0811566405ab4ac69e9ff.tar.gz usdx-57247ddc701c856e3bd0811566405ab4ac69e9ff.tar.xz usdx-57247ddc701c856e3bd0811566405ab4ac69e9ff.zip |
moved AllocateHWnd/DeallocateHWnd from UCommon.pas to WinAllocation.pas. Do NOT use them in USDX code. They are just by the DirWatch and Midi... libs in FPC (Windows).
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1224 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/UltraStar.dpr')
-rw-r--r-- | Game/Code/UltraStar.dpr | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index bcee540d..c71a9300 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -46,7 +46,7 @@ uses glext in 'lib\JEDI-SDL\OpenGL\Pas\glext.pas', sdl in 'lib\JEDI-SDL\SDL\Pas\sdl.pas', sdl_image in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.pas', -// sdl_ttf in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas', + //sdl_ttf in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas', sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas', UMediaCore_SDL in 'Classes\UMediaCore_SDL.pas', @@ -57,9 +57,6 @@ uses bass in 'lib\bass\delphi\bass.pas', UAudioCore_Bass in 'Classes\UAudioCore_Bass.pas', {$ENDIF} - {$IFDEF DARWIN} - PseudoThread in 'MacOSX/Wrapper/PseudoThread.pas', - {$ENDIF} {$IFDEF UsePortaudio} portaudio in 'lib\portaudio\delphi\portaudio.pas', UAudioCore_Portaudio in 'Classes\UAudioCore_Portaudio.pas', @@ -68,20 +65,6 @@ uses portmixer in 'lib\portmixer\delphi\portmixer.pas', {$ENDIF} - {$IFDEF MSWINDOWS} - midiout in 'lib\midi\midiout.pas', - CIRCBUF in 'lib\midi\CIRCBUF.PAS', - MidiType in 'lib\midi\MidiType.PAS', - MidiDefs in 'lib\midi\MidiDefs.PAS', - MidiCons in 'lib\midi\MidiCons.PAS', - MidiFile in 'lib\midi\MidiFile.PAS', - Delphmcb in 'lib\midi\Delphmcb.PAS', - {$ENDIF} - - {$IFDEF MSWINDOWS} - DirWatch in 'lib\other\DirWatch.pas', - {$ENDIF} - {$IFDEF UseFFMpeg} avcodec in 'lib\ffmpeg\avcodec.pas', avformat in 'lib\ffmpeg\avformat.pas', @@ -104,6 +87,27 @@ uses projectM in 'lib\projectM\projectM.pas', {$ENDIF} + {$IFDEF MSWINDOWS} + {$IFDEF FPC} + // FPC compatibility file for Allocate/DeallocateHWnd + WinAllocation in 'lib\other\WinAllocation.pas', + {$ENDIF} + + midiout in 'lib\midi\midiout.pas', + CIRCBUF in 'lib\midi\CIRCBUF.PAS', + MidiType in 'lib\midi\MidiType.PAS', + MidiDefs in 'lib\midi\MidiDefs.PAS', + MidiCons in 'lib\midi\MidiCons.PAS', + MidiFile in 'lib\midi\MidiFile.PAS', + Delphmcb in 'lib\midi\Delphmcb.PAS', + + DirWatch in 'lib\other\DirWatch.pas', + {$ENDIF} + + {$IFDEF DARWIN} + PseudoThread in 'MacOSX/Wrapper/PseudoThread.pas', + {$ENDIF} + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', |