From 0d5d8e6041076b506ffa31cc108fda87d4cbae93 Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 27 Aug 2008 16:36:42 +0000 Subject: project-files updated for new layout git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1315 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 292 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 292 insertions(+) create mode 100644 src/ultrastardx.dpr (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr new file mode 100644 index 00000000..6c5d2fac --- /dev/null +++ b/src/ultrastardx.dpr @@ -0,0 +1,292 @@ +program ultrastardx; + +{$IFDEF MSWINDOWS} + {$R 'ultrastardx.res' 'ultrastardx.rc'} +{$ENDIF} + +{$IFDEF FPC} + {$MODE Delphi} +{$ENDIF} + +{$I switches.inc} + +//{$DEFINE CONSOLE} + +// TODO: check if this is needed for MacOSX too +{$IFDEF MSWINDOWS} + // Set global application-type (GUI/CONSOLE) switch for Windows. + // CONSOLE is the default for FPC, GUI for Delphi, so we have + // to specify one of the two in any case. + {$IFDEF CONSOLE} + {$APPTYPE CONSOLE} + {$ELSE} + {$APPTYPE GUI} + {$ENDIF} +{$ENDIF} + +uses + {$IFDEF Unix} + cthreads, // THIS MUST be the first used unit in FPC if Threads are used!! + // (see http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial) + {$IFNDEF DARWIN} + cwstring, // Enable Unicode support. MacOSX misses some references to iconv. + {$ENDIF} + {$ENDIF} + + {$IFNDEF FPC} + ctypes in 'lib\ctypes\ctypes.pas', // FPC compatibility types for C libs + {$ENDIF} + + //------------------------------ + //Includes - 3rd Party Libraries + //------------------------------ + moduleloader in 'lib\JEDI-SDL\SDL\Pas\moduleloader.pas', + gl in 'lib\JEDI-SDL\OpenGL\Pas\gl.pas', + glu in 'lib\JEDI-SDL\OpenGL\Pas\glu.pas', + 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', + sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas', + UMediaCore_SDL in 'classes\UMediaCore_SDL.pas', + + zlib in 'lib\zlib\zlib.pas', + png in 'lib\libpng\png.pas', + + {$IFDEF UseBass} + bass in 'lib\bass\delphi\bass.pas', + UAudioCore_Bass in 'classes\UAudioCore_Bass.pas', + {$ENDIF} + {$IFDEF UsePortaudio} + portaudio in 'lib\portaudio\delphi\portaudio.pas', + UAudioCore_Portaudio in 'classes\UAudioCore_Portaudio.pas', + {$ENDIF} + {$IFDEF UsePortmixer} + portmixer in 'lib\portmixer\delphi\portmixer.pas', + {$ENDIF} + + {$IFDEF UseFFmpeg} + avcodec in 'lib\ffmpeg\avcodec.pas', + avformat in 'lib\ffmpeg\avformat.pas', + avutil in 'lib\ffmpeg\avutil.pas', + rational in 'lib\ffmpeg\rational.pas', + opt in 'lib\ffmpeg\opt.pas', + avio in 'lib\ffmpeg\avio.pas', + mathematics in 'lib\ffmpeg\mathematics.pas', + UMediaCore_FFmpeg in 'classes\UMediaCore_FFmpeg.pas', + {$IFDEF UseSWScale} + swscale in 'lib\ffmpeg\swscale.pas', + {$ENDIF} + {$ENDIF} + + {$IFDEF UseSRCResample} + samplerate in 'lib\samplerate\samplerate.pas', + {$ENDIF} + + {$IFDEF UseProjectM} + 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', + + + //------------------------------ + //Includes - Menu System + //------------------------------ + UDisplay in 'menu\UDisplay.pas', + UMenu in 'menu\UMenu.pas', + UMenuStatic in 'menu\UMenuStatic.pas', + UMenuText in 'menu\UMenuText.pas', + UMenuButton in 'menu\UMenuButton.pas', + UMenuInteract in 'menu\UMenuInteract.pas', + UMenuSelectSlide in 'menu\UMenuSelectSlide.pas', + UDrawTexture in 'menu\UDrawTexture.pas', + UMenuButtonCollection in 'menu\UMenuButtonCollection.pas', + + //------------------------------ + //Includes - Classes + //------------------------------ + UConfig in 'classes\UConfig.pas', + + UCommon in 'classes\UCommon.pas', + UGraphic in 'classes\UGraphic.pas', + UTexture in 'classes\UTexture.pas', + ULanguage in 'classes\ULanguage.pas', + UMain in 'classes\UMain.pas', + UDraw in 'classes\UDraw.pas', + URecord in 'classes\URecord.pas', + UTime in 'classes\UTime.pas', + TextGL in 'classes\TextGL.pas', + USong in 'classes\USong.pas', + UXMLSong in 'classes\UXMLSong.pas', + USongs in 'classes\USongs.pas', + UIni in 'classes\UIni.pas', + UImage in 'classes\UImage.pas', + ULyrics in 'classes\ULyrics.pas', + UEditorLyrics in 'classes\UEditorLyrics.pas', + USkins in 'classes\USkins.pas', + UThemes in 'classes\UThemes.pas', + ULog in 'classes\ULog.pas', + UJoystick in 'classes\UJoystick.pas', + UDataBase in 'classes\UDataBase.pas', + UCovers in 'classes\UCovers.pas', + UCatCovers in 'classes\UCatCovers.pas', + UFiles in 'classes\UFiles.pas', + UGraphicClasses in 'classes\UGraphicClasses.pas', + UDLLManager in 'classes\UDLLManager.pas', + UPlaylist in 'classes\UPlaylist.pas', + UCommandLine in 'classes\UCommandLine.pas', + URingBuffer in 'classes\URingBuffer.pas', + UTextClasses in 'classes\UTextClasses.pas', + USingScores in 'classes\USingScores.pas', + USingNotes in 'classes\USingNotes.pas', + + UModules in 'classes\UModules.pas', //List of Modules to Load + UHooks in 'classes\UHooks.pas', //Hook Managing + UServices in 'classes\UServices.pas', //Service Managing + UCore in 'classes\UCore.pas', //Core, Maybe remove this + UCoreModule in 'classes\UCoreModule.pas', //^ + UPluginInterface in 'classes\UPluginInterface.pas', //Interface offered by Core to Plugins + uPluginLoader in 'classes\uPluginLoader.pas', //New Plugin Loader Module + + UParty in 'classes\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + UPlatform in 'classes\UPlatform.pas', +{$IFDEF MSWINDOWS} + UPlatformWindows in 'classes\UPlatformWindows.pas', +{$ENDIF} +{$IFDEF LINUX} + UPlatformLinux in 'classes\UPlatformLinux.pas', +{$ENDIF} +{$IFDEF DARWIN} + UPlatformMacOSX in 'classes/UPlatformMacOSX.pas', +{$ENDIF} + + //------------------------------ + //Includes - Media + //------------------------------ + + UMusic in 'classes\UMusic.pas', + UAudioPlaybackBase in 'classes\UAudioPlaybackBase.pas', +{$IF Defined(UsePortaudioPlayback) or Defined(UseSDLPlayback)} + UFFT in 'lib\fft\UFFT.pas', + UAudioPlayback_Softmixer in 'classes\UAudioPlayback_SoftMixer.pas', +{$IFEND} + UAudioConverter in 'classes\UAudioConverter.pas', + + //****************************** + //Pluggable media modules + // The modules are prioritized as in the include list below. + // This means the first entry has highest priority, the last lowest. + //****************************** + + // TODO : these all should be moved to a media folder + +{$IFDEF UseFFmpegVideo} + UVideo in 'classes\UVideo.pas', +{$ENDIF} +{$IFDEF UseProjectM} + // must be after UVideo, so it will not be the default video module + UVisualizer in 'classes\UVisualizer.pas', +{$ENDIF} +{$IFDEF UseBASSInput} + UAudioInput_Bass in 'classes\UAudioInput_Bass.pas', +{$ENDIF} +{$IFDEF UseBASSDecoder} + // prefer Bass to FFmpeg if possible + UAudioDecoder_Bass in 'classes\UAudioDecoder_Bass.pas', +{$ENDIF} +{$IFDEF UseBASSPlayback} + UAudioPlayback_Bass in 'classes\UAudioPlayback_Bass.pas', +{$ENDIF} +{$IFDEF UseSDLPlayback} + UAudioPlayback_SDL in 'classes\UAudioPlayback_SDL.pas', +{$ENDIF} +{$IFDEF UsePortaudioInput} + UAudioInput_Portaudio in 'classes\UAudioInput_Portaudio.pas', +{$ENDIF} +{$IFDEF UsePortaudioPlayback} + UAudioPlayback_Portaudio in 'classes\UAudioPlayback_Portaudio.pas', +{$ENDIF} +{$IFDEF UseFFmpegDecoder} + UAudioDecoder_FFmpeg in 'classes\UAudioDecoder_FFmpeg.pas', +{$ENDIF} + // fallback dummy, must be last + UMedia_dummy in 'classes\UMedia_dummy.pas', + + + //------------------------------ + //Includes - Screens + //------------------------------ + UScreenLoading in 'screens\UScreenLoading.pas', + UScreenWelcome in 'screens\UScreenWelcome.pas', + UScreenMain in 'screens\UScreenMain.pas', + UScreenName in 'screens\UScreenName.pas', + UScreenLevel in 'screens\UScreenLevel.pas', + UScreenSong in 'screens\UScreenSong.pas', + UScreenSing in 'screens\UScreenSing.pas', + UScreenScore in 'screens\UScreenScore.pas', + UScreenOptions in 'screens\UScreenOptions.pas', + UScreenOptionsGame in 'screens\UScreenOptionsGame.pas', + UScreenOptionsGraphics in 'screens\UScreenOptionsGraphics.pas', + UScreenOptionsSound in 'screens\UScreenOptionsSound.pas', + UScreenOptionsLyrics in 'screens\UScreenOptionsLyrics.pas', + UScreenOptionsThemes in 'screens\UScreenOptionsThemes.pas', + UScreenOptionsRecord in 'screens\UScreenOptionsRecord.pas', + UScreenOptionsAdvanced in 'screens\UScreenOptionsAdvanced.pas', + UScreenEditSub in 'screens\UScreenEditSub.pas', + UScreenEdit in 'screens\UScreenEdit.pas', + UScreenEditConvert in 'screens\UScreenEditConvert.pas', + UScreenEditHeader in 'screens\UScreenEditHeader.pas', + UScreenOpen in 'screens\UScreenOpen.pas', + UScreenTop5 in 'screens\UScreenTop5.pas', + UScreenSongMenu in 'screens\UScreenSongMenu.pas', + UScreenSongJumpto in 'screens\UScreenSongJumpto.pas', + UScreenStatMain in 'screens\UScreenStatMain.pas', + UScreenStatDetail in 'screens\UScreenStatDetail.pas', + UScreenCredits in 'screens\UScreenCredits.pas', + UScreenPopup in 'screens\UScreenPopup.pas', + + //Includes - Screens PartyMode + UScreenSingModi in 'screens\UScreenSingModi.pas', + UScreenPartyNewRound in 'screens\UScreenPartyNewRound.pas', + UScreenPartyScore in 'screens\UScreenPartyScore.pas', + UScreenPartyPlayer in 'screens\UScreenPartyPlayer.pas', + UScreenPartyOptions in 'screens\UScreenPartyOptions.pas', + UScreenPartyWin in 'screens\UScreenPartyWin.pas', + + + //------------------------------ + //Includes - Modi SDK + //------------------------------ + ModiSDK in '..\plugins\SDK\ModiSDK.pas', //Old SDK, will be deleted soon + UPluginDefs in '..\plugins\SDK\UPluginDefs.pas', //New SDK, not only Modis + UPartyDefs in '..\plugins\SDK\UPartyDefs.pas', //Headers to register Party Modes + + SysUtils; + +begin + Main; +end. + -- cgit v1.2.3 From e2cdf68acd4bfb5afafba488845f22b126213c88 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 27 Aug 2008 20:41:40 +0000 Subject: Content of macosx/Wrapper moved to macosx. Wrapper deleted git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1325 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 6c5d2fac..8d9f952a 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -105,7 +105,7 @@ uses {$ENDIF} {$IFDEF DARWIN} - PseudoThread in 'macosx/Wrapper/PseudoThread.pas', + PseudoThread in 'macosx\PseudoThread.pas', {$ENDIF} SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', -- cgit v1.2.3 From 2ab22bdad1415813a3e1df329640332702272fc0 Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 1 Sep 2008 17:01:58 +0000 Subject: - new configure/make layout: - configure/main-makefile moved to root-dir - configure-script checked in (no need to call autogen.sh on first run) - autogen.sh, m4, install.sh etc. moved to dists/autogen/ - config.guess/sub for canonical builds - unit-tests moved to test - removed delphi subdir in portaudio/-mixer - COPYING.txt/AUTHORS.txt/... added - dists/delphi7/2005 added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1334 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 8d9f952a..d9d380ab 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -58,11 +58,11 @@ uses UAudioCore_Bass in 'classes\UAudioCore_Bass.pas', {$ENDIF} {$IFDEF UsePortaudio} - portaudio in 'lib\portaudio\delphi\portaudio.pas', + portaudio in 'lib\portaudio\portaudio.pas', UAudioCore_Portaudio in 'classes\UAudioCore_Portaudio.pas', {$ENDIF} {$IFDEF UsePortmixer} - portmixer in 'lib\portmixer\delphi\portmixer.pas', + portmixer in 'lib\portmixer\portmixer.pas', {$ENDIF} {$IFDEF UseFFmpeg} -- cgit v1.2.3 From 7a01b05b3861a667eb32ce2e0fc88ff3bacb99ae Mon Sep 17 00:00:00 2001 From: mogguh Date: Tue, 2 Sep 2008 17:25:26 +0000 Subject: Moved: The folder classes has been renamed to base Updated: ultrastardx.dpr has been changed accordingly git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1339 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 132 ++++++++++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index d9d380ab..3cb32279 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -48,18 +48,18 @@ uses sdl_image in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.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', + UMediaCore_SDL in 'base\UMediaCore_SDL.pas', zlib in 'lib\zlib\zlib.pas', png in 'lib\libpng\png.pas', {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', - UAudioCore_Bass in 'classes\UAudioCore_Bass.pas', + UAudioCore_Bass in 'base\UAudioCore_Bass.pas', {$ENDIF} {$IFDEF UsePortaudio} portaudio in 'lib\portaudio\portaudio.pas', - UAudioCore_Portaudio in 'classes\UAudioCore_Portaudio.pas', + UAudioCore_Portaudio in 'base\UAudioCore_Portaudio.pas', {$ENDIF} {$IFDEF UsePortmixer} portmixer in 'lib\portmixer\portmixer.pas', @@ -73,7 +73,7 @@ uses opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', mathematics in 'lib\ffmpeg\mathematics.pas', - UMediaCore_FFmpeg in 'classes\UMediaCore_FFmpeg.pas', + UMediaCore_FFmpeg in 'base\UMediaCore_FFmpeg.pas', {$IFDEF UseSWScale} swscale in 'lib\ffmpeg\swscale.pas', {$ENDIF} @@ -126,74 +126,74 @@ uses UMenuButtonCollection in 'menu\UMenuButtonCollection.pas', //------------------------------ - //Includes - Classes + //Includes - base //------------------------------ - UConfig in 'classes\UConfig.pas', + UConfig in 'base\UConfig.pas', - UCommon in 'classes\UCommon.pas', - UGraphic in 'classes\UGraphic.pas', - UTexture in 'classes\UTexture.pas', - ULanguage in 'classes\ULanguage.pas', - UMain in 'classes\UMain.pas', - UDraw in 'classes\UDraw.pas', - URecord in 'classes\URecord.pas', - UTime in 'classes\UTime.pas', - TextGL in 'classes\TextGL.pas', - USong in 'classes\USong.pas', - UXMLSong in 'classes\UXMLSong.pas', - USongs in 'classes\USongs.pas', - UIni in 'classes\UIni.pas', - UImage in 'classes\UImage.pas', - ULyrics in 'classes\ULyrics.pas', - UEditorLyrics in 'classes\UEditorLyrics.pas', - USkins in 'classes\USkins.pas', - UThemes in 'classes\UThemes.pas', - ULog in 'classes\ULog.pas', - UJoystick in 'classes\UJoystick.pas', - UDataBase in 'classes\UDataBase.pas', - UCovers in 'classes\UCovers.pas', - UCatCovers in 'classes\UCatCovers.pas', - UFiles in 'classes\UFiles.pas', - UGraphicClasses in 'classes\UGraphicClasses.pas', - UDLLManager in 'classes\UDLLManager.pas', - UPlaylist in 'classes\UPlaylist.pas', - UCommandLine in 'classes\UCommandLine.pas', - URingBuffer in 'classes\URingBuffer.pas', - UTextClasses in 'classes\UTextClasses.pas', - USingScores in 'classes\USingScores.pas', - USingNotes in 'classes\USingNotes.pas', - - UModules in 'classes\UModules.pas', //List of Modules to Load - UHooks in 'classes\UHooks.pas', //Hook Managing - UServices in 'classes\UServices.pas', //Service Managing - UCore in 'classes\UCore.pas', //Core, Maybe remove this - UCoreModule in 'classes\UCoreModule.pas', //^ - UPluginInterface in 'classes\UPluginInterface.pas', //Interface offered by Core to Plugins - uPluginLoader in 'classes\uPluginLoader.pas', //New Plugin Loader Module - - UParty in 'classes\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin - UPlatform in 'classes\UPlatform.pas', + UCommon in 'base\UCommon.pas', + UGraphic in 'base\UGraphic.pas', + UTexture in 'base\UTexture.pas', + ULanguage in 'base\ULanguage.pas', + UMain in 'base\UMain.pas', + UDraw in 'base\UDraw.pas', + URecord in 'base\URecord.pas', + UTime in 'base\UTime.pas', + TextGL in 'base\TextGL.pas', + USong in 'base\USong.pas', + UXMLSong in 'base\UXMLSong.pas', + USongs in 'base\USongs.pas', + UIni in 'base\UIni.pas', + UImage in 'base\UImage.pas', + ULyrics in 'base\ULyrics.pas', + UEditorLyrics in 'base\UEditorLyrics.pas', + USkins in 'base\USkins.pas', + UThemes in 'base\UThemes.pas', + ULog in 'base\ULog.pas', + UJoystick in 'base\UJoystick.pas', + UDataBase in 'base\UDataBase.pas', + UCovers in 'base\UCovers.pas', + UCatCovers in 'base\UCatCovers.pas', + UFiles in 'base\UFiles.pas', + UGraphicClasses in 'base\UGraphicClasses.pas', + UDLLManager in 'base\UDLLManager.pas', + UPlaylist in 'base\UPlaylist.pas', + UCommandLine in 'base\UCommandLine.pas', + URingBuffer in 'base\URingBuffer.pas', + UTextClasses in 'base\UTextClasses.pas', + USingScores in 'base\USingScores.pas', + USingNotes in 'base\USingNotes.pas', + + UModules in 'base\UModules.pas', //List of Modules to Load + UHooks in 'base\UHooks.pas', //Hook Managing + UServices in 'base\UServices.pas', //Service Managing + UCore in 'base\UCore.pas', //Core, Maybe remove this + UCoreModule in 'base\UCoreModule.pas', //^ + UPluginInterface in 'base\UPluginInterface.pas', //Interface offered by Core to Plugins + uPluginLoader in 'base\uPluginLoader.pas', //New Plugin Loader Module + + UParty in 'base\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + UPlatform in 'base\UPlatform.pas', {$IFDEF MSWINDOWS} - UPlatformWindows in 'classes\UPlatformWindows.pas', + UPlatformWindows in 'base\UPlatformWindows.pas', {$ENDIF} {$IFDEF LINUX} - UPlatformLinux in 'classes\UPlatformLinux.pas', + UPlatformLinux in 'base\UPlatformLinux.pas', {$ENDIF} {$IFDEF DARWIN} - UPlatformMacOSX in 'classes/UPlatformMacOSX.pas', + UPlatformMacOSX in 'base/UPlatformMacOSX.pas', {$ENDIF} //------------------------------ //Includes - Media //------------------------------ - UMusic in 'classes\UMusic.pas', - UAudioPlaybackBase in 'classes\UAudioPlaybackBase.pas', + UMusic in 'base\UMusic.pas', + UAudioPlaybackBase in 'base\UAudioPlaybackBase.pas', {$IF Defined(UsePortaudioPlayback) or Defined(UseSDLPlayback)} UFFT in 'lib\fft\UFFT.pas', - UAudioPlayback_Softmixer in 'classes\UAudioPlayback_SoftMixer.pas', + UAudioPlayback_Softmixer in 'base\UAudioPlayback_SoftMixer.pas', {$IFEND} - UAudioConverter in 'classes\UAudioConverter.pas', + UAudioConverter in 'base\UAudioConverter.pas', //****************************** //Pluggable media modules @@ -204,36 +204,36 @@ uses // TODO : these all should be moved to a media folder {$IFDEF UseFFmpegVideo} - UVideo in 'classes\UVideo.pas', + UVideo in 'base\UVideo.pas', {$ENDIF} {$IFDEF UseProjectM} // must be after UVideo, so it will not be the default video module - UVisualizer in 'classes\UVisualizer.pas', + UVisualizer in 'base\UVisualizer.pas', {$ENDIF} {$IFDEF UseBASSInput} - UAudioInput_Bass in 'classes\UAudioInput_Bass.pas', + UAudioInput_Bass in 'base\UAudioInput_Bass.pas', {$ENDIF} {$IFDEF UseBASSDecoder} // prefer Bass to FFmpeg if possible - UAudioDecoder_Bass in 'classes\UAudioDecoder_Bass.pas', + UAudioDecoder_Bass in 'base\UAudioDecoder_Bass.pas', {$ENDIF} {$IFDEF UseBASSPlayback} - UAudioPlayback_Bass in 'classes\UAudioPlayback_Bass.pas', + UAudioPlayback_Bass in 'base\UAudioPlayback_Bass.pas', {$ENDIF} {$IFDEF UseSDLPlayback} - UAudioPlayback_SDL in 'classes\UAudioPlayback_SDL.pas', + UAudioPlayback_SDL in 'base\UAudioPlayback_SDL.pas', {$ENDIF} {$IFDEF UsePortaudioInput} - UAudioInput_Portaudio in 'classes\UAudioInput_Portaudio.pas', + UAudioInput_Portaudio in 'base\UAudioInput_Portaudio.pas', {$ENDIF} {$IFDEF UsePortaudioPlayback} - UAudioPlayback_Portaudio in 'classes\UAudioPlayback_Portaudio.pas', + UAudioPlayback_Portaudio in 'base\UAudioPlayback_Portaudio.pas', {$ENDIF} {$IFDEF UseFFmpegDecoder} - UAudioDecoder_FFmpeg in 'classes\UAudioDecoder_FFmpeg.pas', + UAudioDecoder_FFmpeg in 'base\UAudioDecoder_FFmpeg.pas', {$ENDIF} // fallback dummy, must be last - UMedia_dummy in 'classes\UMedia_dummy.pas', + UMedia_dummy in 'base\UMedia_dummy.pas', //------------------------------ -- cgit v1.2.3 From 8dc13b99b51555be6fa16d271ddb02d995b46d96 Mon Sep 17 00:00:00 2001 From: tobigun Date: Wed, 10 Sep 2008 06:24:16 +0000 Subject: FreeBSD compatibility fixes: - {$IF Defined(Linux)} -> {$IF Defined(Linux) or Defined(BSD)} or {$IF Defined(UNIX)} - config-freebsd.inc added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1357 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 3cb32279..6717e19c 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -173,15 +173,13 @@ uses UParty in 'base\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin UPlatform in 'base\UPlatform.pas', -{$IFDEF MSWINDOWS} +{$IF Defined(MSWINDOWS)} UPlatformWindows in 'base\UPlatformWindows.pas', -{$ENDIF} -{$IFDEF LINUX} - UPlatformLinux in 'base\UPlatformLinux.pas', -{$ENDIF} -{$IFDEF DARWIN} +{$ELSEIF Defined(DARWIN)} UPlatformMacOSX in 'base/UPlatformMacOSX.pas', -{$ENDIF} +{$ELSEIF Defined(UNIX)} + UPlatformLinux in 'base\UPlatformLinux.pas', +{$IFEND} //------------------------------ //Includes - Media -- cgit v1.2.3 From abf47ddd1fe77287136535e2d05ada48b99b8e1f Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 12 Sep 2008 09:51:33 +0000 Subject: - Windows resources (.rc) reduced to the icon - Texture resource names are now directly written to resources.inc - Fonts are no resources anymore. They are moved to game/fonts and can be changed to support multiple charsets (until the TTF part is finished). Fonts are registered in fonts/fonts.in git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1367 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 6717e19c..80d92cad 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -1,7 +1,7 @@ program ultrastardx; {$IFDEF MSWINDOWS} - {$R 'ultrastardx.res' 'ultrastardx.rc'} + {$R '..\icons\ultrastardx-icon.res' '..\icons\ultrastardx-icon.rc'} {$ENDIF} {$IFDEF FPC} -- cgit v1.2.3 From 81f4f34fc7427a8a9e53ce5db026a2dffdb01c68 Mon Sep 17 00:00:00 2001 From: tobigun Date: Sat, 13 Sep 2008 08:30:54 +0000 Subject: Media modules moved from base to media git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1375 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 80d92cad..b75de422 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -48,18 +48,18 @@ uses sdl_image in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.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 'base\UMediaCore_SDL.pas', + UMediaCore_SDL in 'media\UMediaCore_SDL.pas', zlib in 'lib\zlib\zlib.pas', png in 'lib\libpng\png.pas', {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', - UAudioCore_Bass in 'base\UAudioCore_Bass.pas', + UAudioCore_Bass in 'media\UAudioCore_Bass.pas', {$ENDIF} {$IFDEF UsePortaudio} portaudio in 'lib\portaudio\portaudio.pas', - UAudioCore_Portaudio in 'base\UAudioCore_Portaudio.pas', + UAudioCore_Portaudio in 'media\UAudioCore_Portaudio.pas', {$ENDIF} {$IFDEF UsePortmixer} portmixer in 'lib\portmixer\portmixer.pas', @@ -73,7 +73,7 @@ uses opt in 'lib\ffmpeg\opt.pas', avio in 'lib\ffmpeg\avio.pas', mathematics in 'lib\ffmpeg\mathematics.pas', - UMediaCore_FFmpeg in 'base\UMediaCore_FFmpeg.pas', + UMediaCore_FFmpeg in 'media\UMediaCore_FFmpeg.pas', {$IFDEF UseSWScale} swscale in 'lib\ffmpeg\swscale.pas', {$ENDIF} @@ -172,6 +172,11 @@ uses uPluginLoader in 'base\uPluginLoader.pas', //New Plugin Loader Module UParty in 'base\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin + + //------------------------------ + //Includes - Platform + //------------------------------ + UPlatform in 'base\UPlatform.pas', {$IF Defined(MSWINDOWS)} UPlatformWindows in 'base\UPlatformWindows.pas', @@ -185,13 +190,13 @@ uses //Includes - Media //------------------------------ - UMusic in 'base\UMusic.pas', - UAudioPlaybackBase in 'base\UAudioPlaybackBase.pas', + UMusic in 'base\UMusic.pas', + UAudioPlaybackBase in 'media\UAudioPlaybackBase.pas', {$IF Defined(UsePortaudioPlayback) or Defined(UseSDLPlayback)} UFFT in 'lib\fft\UFFT.pas', - UAudioPlayback_Softmixer in 'base\UAudioPlayback_SoftMixer.pas', + UAudioPlayback_Softmixer in 'media\UAudioPlayback_SoftMixer.pas', {$IFEND} - UAudioConverter in 'base\UAudioConverter.pas', + UAudioConverter in 'media\UAudioConverter.pas', //****************************** //Pluggable media modules @@ -199,39 +204,37 @@ uses // This means the first entry has highest priority, the last lowest. //****************************** - // TODO : these all should be moved to a media folder - {$IFDEF UseFFmpegVideo} - UVideo in 'base\UVideo.pas', + UVideo in 'media\UVideo.pas', {$ENDIF} {$IFDEF UseProjectM} // must be after UVideo, so it will not be the default video module - UVisualizer in 'base\UVisualizer.pas', + UVisualizer in 'media\UVisualizer.pas', {$ENDIF} {$IFDEF UseBASSInput} - UAudioInput_Bass in 'base\UAudioInput_Bass.pas', + UAudioInput_Bass in 'media\UAudioInput_Bass.pas', {$ENDIF} {$IFDEF UseBASSDecoder} // prefer Bass to FFmpeg if possible - UAudioDecoder_Bass in 'base\UAudioDecoder_Bass.pas', + UAudioDecoder_Bass in 'media\UAudioDecoder_Bass.pas', {$ENDIF} {$IFDEF UseBASSPlayback} - UAudioPlayback_Bass in 'base\UAudioPlayback_Bass.pas', + UAudioPlayback_Bass in 'media\UAudioPlayback_Bass.pas', {$ENDIF} {$IFDEF UseSDLPlayback} - UAudioPlayback_SDL in 'base\UAudioPlayback_SDL.pas', + UAudioPlayback_SDL in 'media\UAudioPlayback_SDL.pas', {$ENDIF} {$IFDEF UsePortaudioInput} - UAudioInput_Portaudio in 'base\UAudioInput_Portaudio.pas', + UAudioInput_Portaudio in 'media\UAudioInput_Portaudio.pas', {$ENDIF} {$IFDEF UsePortaudioPlayback} - UAudioPlayback_Portaudio in 'base\UAudioPlayback_Portaudio.pas', + UAudioPlayback_Portaudio in 'media\UAudioPlayback_Portaudio.pas', {$ENDIF} {$IFDEF UseFFmpegDecoder} - UAudioDecoder_FFmpeg in 'base\UAudioDecoder_FFmpeg.pas', + UAudioDecoder_FFmpeg in 'media\UAudioDecoder_FFmpeg.pas', {$ENDIF} // fallback dummy, must be last - UMedia_dummy in 'base\UMedia_dummy.pas', + UMedia_dummy in 'media\UMedia_dummy.pas', //------------------------------ -- cgit v1.2.3 From 20d12d5af15bd364cbec888100de6e18bb89561e Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Sat, 20 Sep 2008 18:19:37 +0000 Subject: Equalizer class written TRGB methods now in UThemes instead of ULyrics equalizer reflection now available Reading from Reflectionsettings from theme follows on sunday :P git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1387 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index b75de422..90346c09 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -122,6 +122,7 @@ uses UMenuButton in 'menu\UMenuButton.pas', UMenuInteract in 'menu\UMenuInteract.pas', UMenuSelectSlide in 'menu\UMenuSelectSlide.pas', + UMenuEqualizer in 'menu\UMenuEqualizer.pas', UDrawTexture in 'menu\UDrawTexture.pas', UMenuButtonCollection in 'menu\UMenuButtonCollection.pas', -- cgit v1.2.3 From ca325b5225bbe1336f95d275f8e83a2031614ba8 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 23 Sep 2008 16:57:40 +0000 Subject: svn:keywords test git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1396 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 90346c09..3b783f95 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -1,3 +1,8 @@ +{* + * $URL$ + * $Id$ + *} + program ultrastardx; {$IFDEF MSWINDOWS} -- cgit v1.2.3 From 5f10024b26b3a4560c21483771d69e39adb137d0 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 23 Sep 2008 21:39:36 +0000 Subject: added file headers git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1405 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 3b783f95..36dc7ee8 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -1,4 +1,24 @@ -{* +{* UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * * $URL$ * $Id$ *} -- cgit v1.2.3 From bf7b206aac69a390a65a6c50717f226bb737a40d Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 23 Sep 2008 21:58:57 +0000 Subject: base/uPluginLoader.pas renamed to UPluginLoader.pas. no code change git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1408 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 36dc7ee8..c35cb620 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -195,7 +195,7 @@ uses UCore in 'base\UCore.pas', //Core, Maybe remove this UCoreModule in 'base\UCoreModule.pas', //^ UPluginInterface in 'base\UPluginInterface.pas', //Interface offered by Core to Plugins - uPluginLoader in 'base\uPluginLoader.pas', //New Plugin Loader Module + UPluginLoader in 'base\UPluginLoader.pas', //New Plugin Loader Module UParty in 'base\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin -- cgit v1.2.3 From 322b798413826681915eca1960f081cbc4dd302c Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Mon, 13 Oct 2008 14:14:32 +0000 Subject: Abstraction of the menus background 5 different bg types: none(fallback), colored, texture, video, and fade(for overlays) Some sideeffect is 5 mb less memory usage, don't know for which reasons :P git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1446 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index c35cb620..df546274 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -151,6 +151,13 @@ uses UDrawTexture in 'menu\UDrawTexture.pas', UMenuButtonCollection in 'menu\UMenuButtonCollection.pas', + UMenuBackground in 'menu\UMenuBackground.pas', + UMenuBackgroundNone in 'menu\UMenuBackgroundNone.pas', + UMenuBackgroundColor in 'menu\UMenuBackgroundColor.pas', + UMenuBackgroundTexture in 'menu\UMenuBackgroundTexture.pas', + UMenuBackgroundVideo in 'menu\UMenuBackgroundVideo.pas', + UMenuBackgroundFade in 'menu\UMenuBackgroundFade.pas', + //------------------------------ //Includes - base //------------------------------ @@ -189,6 +196,17 @@ uses USingScores in 'base\USingScores.pas', USingNotes in 'base\USingNotes.pas', + //------------------------------ + //Includes - Plugin Support + //------------------------------ + {UPluginDefines in 'pluginsupport\UPluginDefines.pas', + UPartyDefines in 'pluginsupport\UPartyDefines.pas', + + UPartyMode in 'pluginsupport\UPartyMode.pas', + UPartyManager in 'pluginsupport\UPartyManager.pas', + UPartyModePlugin in 'pluginsupport\UPartyModePlugin.pas', + UPluginLoader in 'pluginsupport\UPluginLoader.pas', } + UModules in 'base\UModules.pas', //List of Modules to Load UHooks in 'base\UHooks.pas', //Hook Managing UServices in 'base\UServices.pas', //Service Managing -- cgit v1.2.3 From beb06421d53294357184e8e761bf9fae10a0c4be Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 20 Oct 2008 09:58:54 +0000 Subject: FPC 2.2.2 compatibility. USDX crashed with an error in iconv_close. After disabling the cwstring unit everything works fine again. Drawback: WideUpperCase() as other unicode support does not work anymore (cwstring was a dummy in 2.2.0 so this is not a big deal). git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1462 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index df546274..979d4545 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -53,7 +53,9 @@ uses {$IFDEF Unix} cthreads, // THIS MUST be the first used unit in FPC if Threads are used!! // (see http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial) - {$IFNDEF DARWIN} + // cwstring crashes in FPC 2.2.2 so do not use the cwstring stuff + {.$IFNDEF DARWIN} + {$IFDEF NOIGNORE} cwstring, // Enable Unicode support. MacOSX misses some references to iconv. {$ENDIF} {$ENDIF} -- cgit v1.2.3 From f4e9ef3a2f98b9f9d0cfc18ed81e5b4b1de0fd12 Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 20 Oct 2008 10:14:21 +0000 Subject: Alpha plane request (SDL_GL_ALPHA_SIZE) removed as we do not need it anymore (was only needed for backbuffer offscreen rendering). git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1464 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 979d4545..07a5e3dc 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -73,7 +73,6 @@ 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', sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas', UMediaCore_SDL in 'media\UMediaCore_SDL.pas', -- cgit v1.2.3 From c01eba6a6494bb583b5bf43bea404b918b5c9c63 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 28 Oct 2008 13:20:53 +0000 Subject: UTextClasses.pas removed git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1481 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 07a5e3dc..7ade4eaf 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -35,8 +35,6 @@ program ultrastardx; {$I switches.inc} -//{$DEFINE CONSOLE} - // TODO: check if this is needed for MacOSX too {$IFDEF MSWINDOWS} // Set global application-type (GUI/CONSOLE) switch for Windows. @@ -79,6 +77,9 @@ uses zlib in 'lib\zlib\zlib.pas', png in 'lib\libpng\png.pas', + //freetype in 'lib\freetype\freetype.pas', + //UFont in 'base\UFont.pas', + {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', UAudioCore_Bass in 'media\UAudioCore_Bass.pas', @@ -193,7 +194,6 @@ uses UPlaylist in 'base\UPlaylist.pas', UCommandLine in 'base\UCommandLine.pas', URingBuffer in 'base\URingBuffer.pas', - UTextClasses in 'base\UTextClasses.pas', USingScores in 'base\USingScores.pas', USingNotes in 'base\USingNotes.pas', -- cgit v1.2.3 From 4025ea3e81b0d2ec4492f3a0b3e374ce1568bdf5 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 28 Oct 2008 19:31:17 +0000 Subject: switch UseFreetype added to toggle between bitmap-font and freetype font git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1484 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 7ade4eaf..842d2369 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -77,8 +77,10 @@ uses zlib in 'lib\zlib\zlib.pas', png in 'lib\libpng\png.pas', - //freetype in 'lib\freetype\freetype.pas', - //UFont in 'base\UFont.pas', + {$IFDEF UseFreetype} + freetype in 'lib\freetype\freetype.pas', + UFont in 'base\UFont.pas', + {$ENDIF} {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', -- cgit v1.2.3 From 8f3b4a5e422bc583cbca1a798c8a765c84b724f9 Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 31 Oct 2008 15:31:56 +0000 Subject: - codepage converter (CP1252, CP1250) added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1488 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 842d2369..e83a7569 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -80,6 +80,7 @@ uses {$IFDEF UseFreetype} freetype in 'lib\freetype\freetype.pas', UFont in 'base\UFont.pas', + UTextEncoding in 'base\UTextEncoding.pas', {$ENDIF} {$IFDEF UseBass} -- cgit v1.2.3 From 84af816478c7814af90cf54840543a7bbd9a681d Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 12 Nov 2008 20:03:57 +0000 Subject: Check done. Not needed for Mac OS X. TODO note cleared. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1517 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index e83a7569..e13bbc13 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -35,7 +35,6 @@ program ultrastardx; {$I switches.inc} -// TODO: check if this is needed for MacOSX too {$IFDEF MSWINDOWS} // Set global application-type (GUI/CONSOLE) switch for Windows. // CONSOLE is the default for FPC, GUI for Delphi, so we have -- cgit v1.2.3 From 458111738476004a914af6fd3e117eb84a35ab6a Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sat, 7 Mar 2009 01:06:07 +0000 Subject: unclutter UMain.pas. Create UPath.pas. Tests on all platformssvn statussvn status git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1625 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index e13bbc13..f4e06b0c 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -198,6 +198,7 @@ uses URingBuffer in 'base\URingBuffer.pas', USingScores in 'base\USingScores.pas', USingNotes in 'base\USingNotes.pas', + UPath in 'base\UPath.pas', //------------------------------ //Includes - Plugin Support -- cgit v1.2.3 From f469075a0335399c753ae5d2d362047dedf116b1 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sat, 7 Mar 2009 21:14:14 +0000 Subject: final cleanup of Umain. Creation of UNote git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1627 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index f4e06b0c..f2896cd2 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -199,6 +199,7 @@ uses USingScores in 'base\USingScores.pas', USingNotes in 'base\USingNotes.pas', UPath in 'base\UPath.pas', + UNote in 'base\UNote.pas', //------------------------------ //Includes - Plugin Support -- cgit v1.2.3 From 31b5e9286f721b7cc81f620a28d8de5d0087c63c Mon Sep 17 00:00:00 2001 From: tobigun Date: Sat, 21 Mar 2009 19:11:54 +0000 Subject: New plugin mode reverted (will be moved to a branch afterwards). Party mode might work again (untested). This might break linux compatibility. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1641 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index f2896cd2..630135cc 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -204,22 +204,6 @@ uses //------------------------------ //Includes - Plugin Support //------------------------------ - {UPluginDefines in 'pluginsupport\UPluginDefines.pas', - UPartyDefines in 'pluginsupport\UPartyDefines.pas', - - UPartyMode in 'pluginsupport\UPartyMode.pas', - UPartyManager in 'pluginsupport\UPartyManager.pas', - UPartyModePlugin in 'pluginsupport\UPartyModePlugin.pas', - UPluginLoader in 'pluginsupport\UPluginLoader.pas', } - - UModules in 'base\UModules.pas', //List of Modules to Load - UHooks in 'base\UHooks.pas', //Hook Managing - UServices in 'base\UServices.pas', //Service Managing - UCore in 'base\UCore.pas', //Core, Maybe remove this - UCoreModule in 'base\UCoreModule.pas', //^ - UPluginInterface in 'base\UPluginInterface.pas', //Interface offered by Core to Plugins - UPluginLoader in 'base\UPluginLoader.pas', //New Plugin Loader Module - UParty in 'base\UParty.pas', // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin //------------------------------ @@ -331,8 +315,6 @@ uses //Includes - Modi SDK //------------------------------ ModiSDK in '..\plugins\SDK\ModiSDK.pas', //Old SDK, will be deleted soon - UPluginDefs in '..\plugins\SDK\UPluginDefs.pas', //New SDK, not only Modis - UPartyDefs in '..\plugins\SDK\UPartyDefs.pas', //Headers to register Party Modes SysUtils; -- cgit v1.2.3 From b3d15a8d334d7f56a2897d9a98eaf55ae7978b55 Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 8 May 2009 14:41:57 +0000 Subject: UAudioPlayback_Softmixer must be UAudioPlayback_SoftMixer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1715 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 630135cc..fb07d66a 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -227,7 +227,7 @@ uses UAudioPlaybackBase in 'media\UAudioPlaybackBase.pas', {$IF Defined(UsePortaudioPlayback) or Defined(UseSDLPlayback)} UFFT in 'lib\fft\UFFT.pas', - UAudioPlayback_Softmixer in 'media\UAudioPlayback_SoftMixer.pas', + UAudioPlayback_SoftMixer in 'media\UAudioPlayback_SoftMixer.pas', {$IFEND} UAudioConverter in 'media\UAudioConverter.pas', -- cgit v1.2.3 From 50ab5b83516699bb7a80123eb7c0f0c0edf40d90 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Thu, 21 May 2009 15:35:54 +0000 Subject: moved TLyricsState from UMusic to UBeatTimer git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1752 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 + 1 file changed, 1 insertion(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index fb07d66a..11796cfa 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -200,6 +200,7 @@ uses USingNotes in 'base\USingNotes.pas', UPath in 'base\UPath.pas', UNote in 'base\UNote.pas', + UBeatTimer in 'base\UBeatTimer.pas', //------------------------------ //Includes - Plugin Support -- cgit v1.2.3 From 917901e8e33438c425aef50a0a7417f32d77b760 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Mon, 9 Nov 2009 00:27:55 +0000 Subject: merged unicode branch (r1931) into trunk git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 11796cfa..0b2ff0bc 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -50,11 +50,7 @@ uses {$IFDEF Unix} cthreads, // THIS MUST be the first used unit in FPC if Threads are used!! // (see http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial) - // cwstring crashes in FPC 2.2.2 so do not use the cwstring stuff - {.$IFNDEF DARWIN} - {$IFDEF NOIGNORE} - cwstring, // Enable Unicode support. MacOSX misses some references to iconv. - {$ENDIF} + cwstring, // Enable Unicode support {$ENDIF} {$IFNDEF FPC} @@ -71,16 +67,12 @@ uses sdl in 'lib\JEDI-SDL\SDL\Pas\sdl.pas', sdl_image in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.pas', sdlutils in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas', + sdlstreams in 'lib\JEDI-SDL\SDL\Pas\sdlstreams.pas', UMediaCore_SDL in 'media\UMediaCore_SDL.pas', zlib in 'lib\zlib\zlib.pas', png in 'lib\libpng\png.pas', - - {$IFDEF UseFreetype} freetype in 'lib\freetype\freetype.pas', - UFont in 'base\UFont.pas', - UTextEncoding in 'base\UTextEncoding.pas', - {$ENDIF} {$IFDEF UseBass} bass in 'lib\bass\delphi\bass.pas', @@ -136,10 +128,22 @@ uses {$IFDEF DARWIN} PseudoThread in 'macosx\PseudoThread.pas', {$ENDIF} - + SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', + {$IFDEF MSWINDOWS} + // TntUnicodeControls + TntSystem in 'lib\TntUnicodeControls\TntSystem.pas', + TntSysUtils in 'lib\TntUnicodeControls\TntSysUtils.pas', + TntWindows in 'lib\TntUnicodeControls\TntWindows.pas', + TntWideStrUtils in 'lib\TntUnicodeControls\TntWideStrUtils.pas', + TntClasses in 'lib\TntUnicodeControls\TntClasses.pas', + TntFormatStrUtils in 'lib\TntUnicodeControls\TntFormatStrUtils.pas', + {$IFNDEF DELPHI_10_UP} // WideStrings for FPC and Delphi < 2006 + TntWideStrings in 'lib\TntUnicodeControls\TntWideStrings.pas', + {$ENDIF} + {$ENDIF} //------------------------------ //Includes - Menu System @@ -175,7 +179,6 @@ uses UDraw in 'base\UDraw.pas', URecord in 'base\URecord.pas', UTime in 'base\UTime.pas', - TextGL in 'base\TextGL.pas', USong in 'base\USong.pas', UXMLSong in 'base\UXMLSong.pas', USongs in 'base\USongs.pas', @@ -198,10 +201,18 @@ uses URingBuffer in 'base\URingBuffer.pas', USingScores in 'base\USingScores.pas', USingNotes in 'base\USingNotes.pas', - UPath in 'base\UPath.pas', + UPathUtils in 'base\UPathUtils.pas', UNote in 'base\UNote.pas', UBeatTimer in 'base\UBeatTimer.pas', + TextGL in 'base\TextGL.pas', + UUnicodeUtils in 'base\UUnicodeUtils.pas', + UFont in 'base\UFont.pas', + UTextEncoding in 'base\UTextEncoding.pas', + + UPath in 'base\UPath.pas', + UFilesystem in 'base\UFilesystem.pas', + //------------------------------ //Includes - Plugin Support //------------------------------ -- cgit v1.2.3 From d589e6221ffcafc077eeefaa60cdc3e33a800558 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Sat, 5 Dec 2009 12:26:00 +0000 Subject: added autodetection of utf8 used w3c regex to match all song lines whether they are utf8 lines and decode it on match as utf8 and as latin1 otherwise git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1964 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 0b2ff0bc..eca3ecc2 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -132,6 +132,8 @@ uses SQLiteTable3 in 'lib\SQLite\SQLiteTable3.pas', SQLite3 in 'lib\SQLite\SQLite3.pas', + pcre in 'lib\pcre\pcre.pas', + {$IFDEF MSWINDOWS} // TntUnicodeControls TntSystem in 'lib\TntUnicodeControls\TntSystem.pas', -- cgit v1.2.3 From 4711217f127aa0c10fa52755fd567c570277a1a1 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Tue, 12 Jan 2010 17:42:41 +0000 Subject: merged lua into trunk git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2071 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index eca3ecc2..a0ee7c20 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -147,6 +147,21 @@ uses {$ENDIF} {$ENDIF} + //------------------------------ + //Includes - Lua Support + //------------------------------ + ULua in 'lib\Lua\ULua.pas', + ULuaUtils in 'lua\ULuaUtils.pas', + ULuaGl in 'lua\ULuaGl.pas', + ULuaLog in 'lua\ULuaLog.pas', + ULuaTextGL in 'lua\ULuaTextGL.pas', + ULuaTexture in 'lua\ULuaTexture.pas', + UHookableEvent in 'lua\UHookableEvent.pas', + ULuaCore in 'lua\ULuaCore.pas', + ULuaUsdx in 'lua\ULuaUsdx.pas', + ULuaParty in 'lua\ULuaParty.pas', + ULuaScreenSing in 'lua\ULuaScreenSing.pas', + //------------------------------ //Includes - Menu System //------------------------------ @@ -322,6 +337,7 @@ uses UScreenPartyScore in 'screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'screens\UScreenPartyPlayer.pas', UScreenPartyOptions in 'screens\UScreenPartyOptions.pas', + UScreenPartyRounds in 'screens\UScreenPartyRounds.pas', UScreenPartyWin in 'screens\UScreenPartyWin.pas', -- cgit v1.2.3 From f29685523465fb0d2d0d6bbe9985cf11207cde23 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Tue, 12 Jan 2010 19:55:25 +0000 Subject: deleted leftovers from old plugin system and party mode git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2080 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index a0ee7c20..76ff995f 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -212,7 +212,6 @@ uses UCatCovers in 'base\UCatCovers.pas', UFiles in 'base\UFiles.pas', UGraphicClasses in 'base\UGraphicClasses.pas', - UDLLManager in 'base\UDLLManager.pas', UPlaylist in 'base\UPlaylist.pas', UCommandLine in 'base\UCommandLine.pas', URingBuffer in 'base\URingBuffer.pas', @@ -332,7 +331,6 @@ uses UScreenPopup in 'screens\UScreenPopup.pas', //Includes - Screens PartyMode - UScreenSingModi in 'screens\UScreenSingModi.pas', UScreenPartyNewRound in 'screens\UScreenPartyNewRound.pas', UScreenPartyScore in 'screens\UScreenPartyScore.pas', UScreenPartyPlayer in 'screens\UScreenPartyPlayer.pas', @@ -340,12 +338,6 @@ uses UScreenPartyRounds in 'screens\UScreenPartyRounds.pas', UScreenPartyWin in 'screens\UScreenPartyWin.pas', - - //------------------------------ - //Includes - Modi SDK - //------------------------------ - ModiSDK in '..\plugins\SDK\ModiSDK.pas', //Old SDK, will be deleted soon - SysUtils; begin -- cgit v1.2.3 From c710a7b0d52b408b865e82eb55480146cbbbaed7 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Mon, 22 Feb 2010 15:59:35 +0000 Subject: completly remove unused UScreenWelcome git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2138 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 1 - 1 file changed, 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index 76ff995f..fe434142 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -302,7 +302,6 @@ uses //Includes - Screens //------------------------------ UScreenLoading in 'screens\UScreenLoading.pas', - UScreenWelcome in 'screens\UScreenWelcome.pas', UScreenMain in 'screens\UScreenMain.pas', UScreenName in 'screens\UScreenName.pas', UScreenLevel in 'screens\UScreenLevel.pas', -- cgit v1.2.3 From c692c8a5e082bd02bd7dc7feb6e3f0056ea75f0b Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 19 Apr 2010 16:09:09 +0000 Subject: - added manifest file to make ultrastardx UAC aware - this leverages usdx from a legacy app to a vista/win7 compatible app - disables the virtual-store and other dirty UAC legacy app stuff - checking for read-only files should work now - the manifest is embedded in the exe via the RC file (which previously only contained the icon) - alternatively the file ultrastardx.exe.manifest can be put in the game directory along with the .exe file. Vista/Win7 will autodetect this file. - to check if this works: - open the task-manager - right click on ultrastardx - if "UAC-Virtualization" is checked, the app is still executed in legacy mode which should not happen. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2249 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/ultrastardx.dpr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ultrastardx.dpr') diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index fe434142..f6c9558c 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -26,7 +26,7 @@ program ultrastardx; {$IFDEF MSWINDOWS} - {$R '..\icons\ultrastardx-icon.res' '..\icons\ultrastardx-icon.rc'} + {$R '..\res\ultrastardx.res' '..\res\ultrastardx.rc'} {$ENDIF} {$IFDEF FPC} -- cgit v1.2.3