X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2FDoom2DF.lpr;h=eb38f0e4eb351e7a34e35a59da36c88a5d97d6bf;hb=b55db3de3f8db2e7d30aec8bd2e54e812ccbd06e;hp=7f869f160006312da7185f9baf3d2a2a8e88cfe6;hpb=dbf81afaefeb52e53d2b8af3a782277229c5adaa;p=d2df-sdl.git diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr index 7f869f1..eb38f0e 100644 --- a/src/game/Doom2DF.lpr +++ b/src/game/Doom2DF.lpr @@ -14,6 +14,7 @@ *) {$INCLUDE ../shared/a_modes.inc} {$IFDEF ANDROID}library{$ELSE}program{$ENDIF} Doom2DF; + {$IFNDEF HEADLESS} {$IFDEF WINDOWS} {$APPTYPE GUI} @@ -21,54 +22,6 @@ {$ENDIF} {$HINTS OFF} -{$IF DEFINED(USE_SYSSTUB)} - {$IF DEFINED(USE_SDL) OR DEFINED(USE_SDL2)} - {$ERROR Only one system driver must be selected!} - {$ENDIF} -{$ELSEIF DEFINED(USE_SDL)} - {$IF DEFINED(USE_SYSSTUB) OR DEFINED(USE_SDL2)} - {$ERROR Only one system driver must be selected!} - {$ENDIF} -{$ELSEIF DEFINED(USE_SDL2)} - {$IF DEFINED(USE_SYSSTUB) OR DEFINED(USE_SDL)} - {$ERROR Only one system driver must be selected!} - {$ENDIF} -{$ELSE} - {$ERROR System driver not selected. Use -dUSE_SYSSTUB or -dUSE_SDL or -dUSE_SDL2} -{$ENDIF} - -{$IF DEFINED(USE_SOUNDSTUB)} - {$IF DEFINED(USE_SDLMIXER) OR DEFINED(USE_FMOD) OR DEFINED(USE_OPENAL)} - {$ERROR Only one sound driver must be selected!} - {$ENDIF} -{$ELSEIF DEFINED(USE_SDLMIXER)} - {$IF DEFINED(USE_SOUNDSTUB) OR DEFINED(USE_FMOD) OR DEFINED(USE_OPENAL)} - {$ERROR Only one sound driver must be selected!} - {$ENDIF} -{$ELSEIF DEFINED(USE_FMOD)} - {$IF DEFINED(USE_SOUNDSTUB) OR DEFINED(USE_SDLMIXER) OR DEFINED(USE_OPENAL)} - {$ERROR Only one sound driver must be selected!} - {$ENDIF} -{$ELSEIF DEFINED(USE_OPENAL)} - {$IF DEFINED(USE_SOUNDSTUB) OR DEFINED(USE_SDLMIXER) OR DEFINED(USE_FMOD)} - {$ERROR Only one sound driver must be selected!} - {$ENDIF} -{$ELSE} - {$ERROR Sound driver not selected. Use -dUSE_SOUNDSTUB or -dUSE_SDLMIXER or -dUSE_FMOD or -dUSE_OPENAL} -{$ENDIF} - -{$IFDEF ENABLE_HOLMES} - {$IFDEF HEADLESS} - {$ERROR Holmes in HEADLESS mode has no sense} - {$ENDIF} - {$IFNDEF USE_SDL2} - {$ERROR Holmes supported only with SDL2} - {$ENDIF} - {$IFDEF USE_GLES1} - {$ERROR Holmes not supported with GLES} - {$ENDIF} -{$ENDIF} - uses {$IFDEF ANDROID} ctypes, @@ -89,6 +42,9 @@ uses {$IFDEF USE_SDL} SDL, + {$IFDEF USE_SDLMIXER} + SDL_mixer, + {$ENDIF} {$ENDIF} {$IFDEF USE_SDL2} SDL2 in '../lib/sdl2/sdl2.pas', @@ -96,6 +52,12 @@ uses SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas', {$ENDIF} {$ENDIF} +{$IFDEF USE_SYSSTUB} + {$IFDEF USE_SDLMIXER} + SDL2 in '../lib/sdl2/sdl2.pas', + SDL2_mixer in '../lib/sdl2/SDL2_mixer.pas', + {$ENDIF} +{$ENDIF} {$IFDEF USE_OPENAL} AL in '../lib/openal/al.pas', @@ -220,9 +182,87 @@ uses fui_ctls in '../flexui/fui_ctls.pas', {$ENDIF} - ImagingTypes, - Imaging, - ImagingUtility; + ImagingDds in '../lib/vampimg/ImagingDds.pas', + ImagingFormats in '../lib/vampimg/ImagingFormats.pas', + ImagingPcx in '../lib/vampimg/ImagingPcx.pas', + ImagingColors in '../lib/vampimg/ImagingColors.pas', + ImagingNetworkGraphics in '../lib/vampimg/ImagingNetworkGraphics.pas', +// ImagingComponents in '../lib/vampimg/ImagingComponents.pas', + ImagingRadiance in '../lib/vampimg/ImagingRadiance.pas', + ImagingPortableMaps in '../lib/vampimg/ImagingPortableMaps.pas', + ImagingXpm in '../lib/vampimg/ImagingXpm.pas', + ImagingBitmap in '../lib/vampimg/ImagingBitmap.pas', + ImagingTypes in '../lib/vampimg/ImagingTypes.pas', + Imaging in '../lib/vampimg/Imaging.pas', + ImagingExtras in '../lib/vampimg/ImagingExtras.pas', + ImagingGif in '../lib/vampimg/ImagingGif.pas', + ImagingIO in '../lib/vampimg/ImagingIO.pas', + imjdhuff in '../lib/vampimg/JpegLib/imjdhuff.pas', + imjdmerge in '../lib/vampimg/JpegLib/imjdmerge.pas', + imjdapimin in '../lib/vampimg/JpegLib/imjdapimin.pas', + imjidctflt in '../lib/vampimg/JpegLib/imjidctflt.pas', + imjdsample in '../lib/vampimg/JpegLib/imjdsample.pas', + imjfdctint in '../lib/vampimg/JpegLib/imjfdctint.pas', + imjdcoefct in '../lib/vampimg/JpegLib/imjdcoefct.pas', + imjdmainct in '../lib/vampimg/JpegLib/imjdmainct.pas', + imjcmaster in '../lib/vampimg/JpegLib/imjcmaster.pas', + imjdcolor in '../lib/vampimg/JpegLib/imjdcolor.pas', + imjcphuff in '../lib/vampimg/JpegLib/imjcphuff.pas', + imjidctint in '../lib/vampimg/JpegLib/imjidctint.pas', + imjutils in '../lib/vampimg/JpegLib/imjutils.pas', + imjdmarker in '../lib/vampimg/JpegLib/imjdmarker.pas', + imjdmaster in '../lib/vampimg/JpegLib/imjdmaster.pas', + imjmorecfg in '../lib/vampimg/JpegLib/imjmorecfg.pas', + imjdct in '../lib/vampimg/JpegLib/imjdct.pas', + imjcdctmgr in '../lib/vampimg/JpegLib/imjcdctmgr.pas', + imjerror in '../lib/vampimg/JpegLib/imjerror.pas', + imjpeglib in '../lib/vampimg/JpegLib/imjpeglib.pas', + imjccoefct in '../lib/vampimg/JpegLib/imjccoefct.pas', + imjfdctfst in '../lib/vampimg/JpegLib/imjfdctfst.pas', + imjchuff in '../lib/vampimg/JpegLib/imjchuff.pas', + imjdinput in '../lib/vampimg/JpegLib/imjdinput.pas', + imjdapistd in '../lib/vampimg/JpegLib/imjdapistd.pas', + imjidctfst in '../lib/vampimg/JpegLib/imjidctfst.pas', + imjcsample in '../lib/vampimg/JpegLib/imjcsample.pas', + imjmemmgr in '../lib/vampimg/JpegLib/imjmemmgr.pas', + imjmemnobs in '../lib/vampimg/JpegLib/imjmemnobs.pas', + imjfdctflt in '../lib/vampimg/JpegLib/imjfdctflt.pas', + imjcmainct in '../lib/vampimg/JpegLib/imjcmainct.pas', + imjcprepct in '../lib/vampimg/JpegLib/imjcprepct.pas', + imjidctred in '../lib/vampimg/JpegLib/imjidctred.pas', + imjcomapi in '../lib/vampimg/JpegLib/imjcomapi.pas', +// imjidctasm in '../lib/vampimg/JpegLib/imjidctasm.pas', + imjcapimin in '../lib/vampimg/JpegLib/imjcapimin.pas', + imjquant1 in '../lib/vampimg/JpegLib/imjquant1.pas', + imjquant2 in '../lib/vampimg/JpegLib/imjquant2.pas', + imjcinit in '../lib/vampimg/JpegLib/imjcinit.pas', + imjdphuff in '../lib/vampimg/JpegLib/imjdphuff.pas', + imjcapistd in '../lib/vampimg/JpegLib/imjcapistd.pas', + imjinclude in '../lib/vampimg/JpegLib/imjinclude.pas', + imjccolor in '../lib/vampimg/JpegLib/imjccolor.pas', + imjcmarker in '../lib/vampimg/JpegLib/imjcmarker.pas', + imjcparam in '../lib/vampimg/JpegLib/imjcparam.pas', + imjddctmgr in '../lib/vampimg/JpegLib/imjddctmgr.pas', + imjdpostct in '../lib/vampimg/JpegLib/imjdpostct.pas', + imjdeferr in '../lib/vampimg/JpegLib/imjdeferr.pas', + ImagingCanvases in '../lib/vampimg/ImagingCanvases.pas', + iminffast in '../lib/vampimg/ZLib/iminffast.pas', + imzdeflate in '../lib/vampimg/ZLib/imzdeflate.pas', + imtrees in '../lib/vampimg/ZLib/imtrees.pas', + dzlib in '../lib/vampimg/ZLib/dzlib.pas', + impaszlib in '../lib/vampimg/ZLib/impaszlib.pas', + iminfcodes in '../lib/vampimg/ZLib/iminfcodes.pas', + iminfblock in '../lib/vampimg/ZLib/iminfblock.pas', + imzutil in '../lib/vampimg/ZLib/imzutil.pas', + imadler in '../lib/vampimg/ZLib/imadler.pas', + imzinflate in '../lib/vampimg/ZLib/imzinflate.pas', + iminfutil in '../lib/vampimg/ZLib/iminfutil.pas', + iminftrees in '../lib/vampimg/ZLib/iminftrees.pas', + ImagingJpeg in '../lib/vampimg/ImagingJpeg.pas', + ImagingClasses in '../lib/vampimg/ImagingClasses.pas', + ImagingPsd in '../lib/vampimg/ImagingPsd.pas', + ImagingTarga in '../lib/vampimg/ImagingTarga.pas', + ImagingUtility in '../lib/vampimg/ImagingUtility.pas'; {$IFDEF WINDOWS} {$R *.res}