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/Makefile.in | 16 +- src/UltraStar-linux.lpi | 82 ------- src/UltraStar.dpr | 294 ----------------------- src/UltraStar.lpi | 598 ---------------------------------------------- src/UltraStar.lpr | 19 -- src/UltraStar.rc | 38 --- src/configure.ac | 10 +- src/lazres-UltraStar.bat | 2 - src/ultrastardx-linux.lpi | 81 +++++++ src/ultrastardx.dpr | 292 ++++++++++++++++++++++ src/ultrastardx.lpi | 80 +++++++ src/ultrastardx.lpr | 19 ++ src/ultrastardx.rc | 38 +++ 13 files changed, 523 insertions(+), 1046 deletions(-) delete mode 100644 src/UltraStar-linux.lpi delete mode 100644 src/UltraStar.dpr delete mode 100644 src/UltraStar.lpi delete mode 100644 src/UltraStar.lpr delete mode 100644 src/UltraStar.rc delete mode 100644 src/lazres-UltraStar.bat create mode 100644 src/ultrastardx-linux.lpi create mode 100644 src/ultrastardx.dpr create mode 100644 src/ultrastardx.lpi create mode 100644 src/ultrastardx.lpr create mode 100644 src/ultrastardx.rc diff --git a/src/Makefile.in b/src/Makefile.in index 8fc31bd8..c2f58a47 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -35,7 +35,7 @@ USDX_PREFIX = ultrastardx USDX_VERSION = @PACKAGE_VERSION@ USDX_TARNAME = @PACKAGE_TARNAME@ -USDX_TOOLS_DIR = $(usdxrootdir)/Tools +USDX_TOOLS_DIR = $(usdxrootdir)/tools USDX_LIB_DIR = ./lib USDX_BUILD_DIR = ./build @@ -56,7 +56,7 @@ RESEXTRACTOR_DIR = $(USDX_TOOLS_DIR)/$(RESEXTRACTOR_NAME) RESEXTRACTOR_BIN = $(RESEXTRACTOR_DIR)/$(RESEXTRACTOR_NAME)$(EXE_SUFFIX) RESOURCE_DIR = $(usdxrootdir)/Resources RESOURCE_FILE = resource.inc -RC_FILE = UltraStar.rc +RC_FILE = ultrastardx.rc EXTRA_SRCDIRS += $(RESEXTRACTOR_DIR) # cwrapper settings @@ -98,7 +98,7 @@ PLINKFLAGS = -k"$(linkflags)" endif # dpr project file used as input -USDX_SRC = UltraStar.dpr +USDX_SRC = ultrastardx.dpr # name of executable USDX_BIN_NAME = $(USDX_PREFIX)$(EXE_SUFFIX) USDX_BIN = $(usdxrootdir)/$(USDX_BIN_NAME) @@ -169,7 +169,7 @@ uninstall-local: install-global: install-data install-exec install-data: - $(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Artwork" install-data-recursive + $(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/artwork" RECURSIVE_DST_DIR="$(INSTALL_datadir)/artwork" install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Languages" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Languages" install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Sounds" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Sounds" install-data-recursive $(MAKE) RECURSIVE_SRC_DIR="$(usdxrootdir)/Themes" RECURSIVE_DST_DIR="$(INSTALL_datadir)/Themes" install-data-recursive @@ -197,7 +197,7 @@ install-exec: uninstall-global: uninstall-data uninstall-exec uninstall-data: - rm -rf "$(INSTALL_datadir)/Artwork" + rm -rf "$(INSTALL_datadir)/artwork" rm -rf "$(INSTALL_datadir)/Languages" rm -rf "$(INSTALL_datadir)/Sounds" rm -rf "$(INSTALL_datadir)/Themes" @@ -217,7 +217,7 @@ disttmpdir = ./distdir dist: # $(MKDIR_P) $(disttmpdir) # acm $(usdxrootdir) $(disttmpdir) -# $(MAKE) -C $(disttmpdir)/Game/Code distclean +# $(MAKE) -C $(disttmpdir)/src distclean # tar cvzf $(USDX_TARNAME)-$(USDX_VERSION).tar.gz $(usdxrootdir) @echo "Comming soon" @@ -273,7 +273,7 @@ macosx-app: all $(INSTALL_DATA) $(usdxrootdir)/Resources/Graphics/ustar-icon_v01.icns $(macosx_bundle_path)/Resources/ # the info.plist file - $(INSTALL_DATA) MacOSX/Info.plist $(macosx_bundle_path)/ + $(INSTALL_DATA) macosx/Info.plist $(macosx_bundle_path)/ # Copy the resources. $(MAKE) install-global INSTALL_datadir=$(macosx_bundle_path)/Resources bindir=$(macosx_bundle_path)/MacOS @@ -328,7 +328,7 @@ endef macosx-disk-image: macosx-standalone-app /bin/rm -f ultrastardx.dmg $(HDIUTIL) create -type SPARSE -size 30m -fs HFS+ -volname UltraStarDeluxe -ov -attach UltraStarDeluxe.sparseimage - /bin/cp -R ../../UltraStarDeluxe.app /Volumes/UltraStarDeluxe + /bin/cp -R ../UltraStarDeluxe.app /Volumes/UltraStarDeluxe # /bin/cp ultrastardx/icons/UltraStarDeluxeVolumeIcon.icns /Volumes/UltraStarDeluxe/.VolumeIcon.icns # /Developer/Tools/SetFile -a C /Volumes/UltraStarDeluxe/.VolumeIcon.icns /Volumes/UltraStarDeluxe $(HDIUTIL) detach /Volumes/UltraStarDeluxe diff --git a/src/UltraStar-linux.lpi b/src/UltraStar-linux.lpi deleted file mode 100644 index d3866f94..00000000 --- a/src/UltraStar-linux.lpi +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/UltraStar.dpr b/src/UltraStar.dpr deleted file mode 100644 index 14055065..00000000 --- a/src/UltraStar.dpr +++ /dev/null @@ -1,294 +0,0 @@ -program UltraStar; - -{$IFDEF MSWINDOWS} - {$R 'UltraStar.res' 'UltraStar.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', - //ULCD in 'Classes\ULCD.pas', - //ULight in 'Classes\ULight.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 '..\Modis\SDK\ModiSDK.pas', //Old SDK, will be deleted soon - UPluginDefs in '..\Modis\SDK\UPluginDefs.pas', //New SDK, not only Modis - UPartyDefs in '..\Modis\SDK\UPartyDefs.pas', //Headers to register Party Modes - - SysUtils; - -begin - Main; -end. - diff --git a/src/UltraStar.lpi b/src/UltraStar.lpi deleted file mode 100644 index 410be084..00000000 --- a/src/UltraStar.lpi +++ /dev/null @@ -1,598 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/UltraStar.lpr b/src/UltraStar.lpr deleted file mode 100644 index 66badecb..00000000 --- a/src/UltraStar.lpr +++ /dev/null @@ -1,19 +0,0 @@ -// *************************************************************************** -// -// Developers PLEASE NOTE !!!!!!! -// -// As of september 2007, I am working towards porting Ultrastar-DX to run -// on Linux. I will be modifiying the source to make it compile in lazarus -// on windows & linux and I will make sure that it compiles in delphi still -// To help me in this endevour, please can you make a point of remembering -// that linux is CASE SENSATIVE, and file / unit names must be as per -// the filename exactly. -// -// EG : opengl12.pas must not be OpenGL in the uses cluase. -// -// thanks for your help... -// -// *************************************************************************** - -{$I UltraStar.dpr} - diff --git a/src/UltraStar.rc b/src/UltraStar.rc deleted file mode 100644 index 07061d4d..00000000 --- a/src/UltraStar.rc +++ /dev/null @@ -1,38 +0,0 @@ -Font TEX "../Resources/Fonts/Normal/eurostar_regular.png" -Font FNT "../Resources/Fonts/Normal/eurostar_regular.dat" - -FontB TEX "../Resources/Fonts/Bold/eurostar_regular_bold.png" -FontB FNT "../Resources/Fonts/Bold/eurostar_regular_bold.dat" - -FontO TEX "../Resources/Fonts/Outline 1/Outline 1.png" -FontO FNT "../Resources/Fonts/Outline 1/Outline 1.dat" - -FontO2 TEX "../Resources/Fonts/Outline 2/Outline 2.png" -FontO2 FNT "../Resources/Fonts/Outline 2/Outline 2.dat" - -MAINICON ICON "../Resources/Graphics/ustar-icon_v01.ico" -WINDOWICON TEX "../Resources/Graphics/ustar-icon.png" - -CRDTS_BG TEX "../Resources/Graphics/credits_v5_bg.png" -CRDTS_OVL TEX "../Resources/Graphics/credits_v5_overlay.png" -CRDTS_blindguard TEX "../Resources/Graphics/names_blindguard.png" -CRDTS_blindy TEX "../Resources/Graphics/names_blindy.png" -CRDTS_canni TEX "../Resources/Graphics/names_canni.png" -CRDTS_commandio TEX "../Resources/Graphics/names_commandio.png" -CRDTS_lazyjoker TEX "../Resources/Graphics/names_lazyjoker.png" -CRDTS_mog TEX "../Resources/Graphics/names_mog.png" -CRDTS_mota TEX "../Resources/Graphics/names_mota.png" -CRDTS_skillmaster TEX "../Resources/Graphics/names_skillmaster.png" -CRDTS_whiteshark TEX "../Resources/Graphics/names_whiteshark.png" -INTRO_L01 TEX "../Resources/Graphics/intro-l-01.png" -INTRO_L02 TEX "../Resources/Graphics/intro-l-02.png" -INTRO_L03 TEX "../Resources/Graphics/intro-l-03.png" -INTRO_L04 TEX "../Resources/Graphics/intro-l-04.png" -INTRO_L05 TEX "../Resources/Graphics/intro-l-05.png" -INTRO_L06 TEX "../Resources/Graphics/intro-l-06.png" -INTRO_L07 TEX "../Resources/Graphics/intro-l-07.png" -INTRO_L08 TEX "../Resources/Graphics/intro-l-08.png" -INTRO_L09 TEX "../Resources/Graphics/intro-l-09.png" -OUTRO_BG TEX "../Resources/Graphics/outro-bg.png" -OUTRO_ESC TEX "../Resources/Graphics/outro-esc.png" -OUTRO_EXD TEX "../Resources/Graphics/outro-exit-dark.png" diff --git a/src/configure.ac b/src/configure.ac index 4f1344f5..1152c1a1 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -21,7 +21,7 @@ PACKAGE_IRC="#ultrastardx at quakenet.org" AC_SUBST(PACKAGE_IRC) # Specify a source-file so autoconf can check if the source-dir exists -AC_CONFIG_SRCDIR(UltraStar.dpr) +AC_CONFIG_SRCDIR(ultrastardx.dpr) # This one is not used by autoconf at the moment. # When it is used maybe we don't need aclocal's -I parameter anymore. @@ -32,9 +32,9 @@ AC_PRESERVE_HELP_ORDER # set root directory (= trunk dir) # ..resolved: used by configure.ac -usdxroot=../.. +usdxroot=.. # ..unresolved: used by .in files -usdxrootdir=\${top_srcdir}/../.. +usdxrootdir=\${top_srcdir}/.. AC_SUBST(usdxrootdir) # set sharerootdir to the resolved dataroot-dir for the config-*.inc file. @@ -307,7 +307,7 @@ AC_ARG_ENABLE(global, # add local option AC_ARG_ENABLE(local, [AS_HELP_STRING([--enable-local], - [install into local folders (../../...) (same as --disable-global) @<:@default=no@:>@]))], + [install into local folders (../...) (same as --disable-global) @<:@default=no@:>@]))], [test $enableval = "yes" && LOCAL_BUILD="yes"], []) # add dev_layout option @@ -452,7 +452,7 @@ AC_SUBST(LIBS) AC_CONFIG_FILES([config-$FPC_PLATFORM.inc:config.inc.in]) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([$usdxroot/Tools/ResourceExtractor/Makefile]) +AC_CONFIG_FILES([$usdxroot/tools/ResourceExtractor/Makefile]) if [[ x$libprojectM_NEEDS_CWRAPPER = xyes ]]; then AC_CONFIG_FILES([lib/projectM/cwrapper/Makefile]) fi diff --git a/src/lazres-UltraStar.bat b/src/lazres-UltraStar.bat deleted file mode 100644 index 39fc6a06..00000000 --- a/src/lazres-UltraStar.bat +++ /dev/null @@ -1,2 +0,0 @@ -C:\lazarus\tools\lazres.exe UltraStar.lrs "..\Fonts\Normal\eurostar_regular.png" "..\Fonts\Normal\eurostar_regular.dat" "..\Fonts\Bold\eurostar_regular_bold.png" "..\Fonts\Bold\eurostar_regular_bold.dat" "..\Fonts\Outline 1\Outline 1.PNG" "..\Fonts\Outline 1\Outline 1.dat" "..\Fonts\Outline 2\Outline 2.PNG" "..\Fonts\Outline 2\Outline 2.dat" "..\Graphics\ustar-icon_v01.ico" "..\Graphics\credits_v5_bg.png" "..\Graphics\credits_v5_overlay.png" "..\Graphics\names_blindguard.png" "..\Graphics\names_blindy.png" "..\Graphics\names_canni.png" "..\Graphics\names_commandio.png" "..\Graphics\names_lazyjoker.png" "..\Graphics\names_mog.png" "..\Graphics\names_mota.png" "..\Graphics\names_skillmaster.png" "..\Graphics\names_whiteshark.png" "..\Graphics\intro-l-01.png" "..\Graphics\intro-l-02.png" "..\Graphics\intro-l-03.png" "..\Graphics\intro-l-04.png" "..\Graphics\intro-l-05.png" "..\Graphics\intro-l-06.png" "..\Graphics\intro-l-07.png" "..\Graphics\intro-l-08.png" "..\Graphics\intro-l-09.png" "..\Graphics\outro-bg.png" "..\Graphics\outro-esc.png" "..\Graphics\outro-exit-dark.png" - diff --git a/src/ultrastardx-linux.lpi b/src/ultrastardx-linux.lpi new file mode 100644 index 00000000..7ae60283 --- /dev/null +++ b/src/ultrastardx-linux.lpi @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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. + diff --git a/src/ultrastardx.lpi b/src/ultrastardx.lpi new file mode 100644 index 00000000..fdbeee47 --- /dev/null +++ b/src/ultrastardx.lpi @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ultrastardx.lpr b/src/ultrastardx.lpr new file mode 100644 index 00000000..09a44f45 --- /dev/null +++ b/src/ultrastardx.lpr @@ -0,0 +1,19 @@ +// *************************************************************************** +// +// Developers PLEASE NOTE !!!!!!! +// +// As of september 2007, I am working towards porting Ultrastar-DX to run +// on Linux. I will be modifiying the source to make it compile in lazarus +// on windows & linux and I will make sure that it compiles in delphi still +// To help me in this endevour, please can you make a point of remembering +// that linux is CASE SENSATIVE, and file / unit names must be as per +// the filename exactly. +// +// EG : opengl12.pas must not be OpenGL in the uses cluase. +// +// thanks for your help... +// +// *************************************************************************** + +{$I ultrastardx.dpr} + diff --git a/src/ultrastardx.rc b/src/ultrastardx.rc new file mode 100644 index 00000000..07061d4d --- /dev/null +++ b/src/ultrastardx.rc @@ -0,0 +1,38 @@ +Font TEX "../Resources/Fonts/Normal/eurostar_regular.png" +Font FNT "../Resources/Fonts/Normal/eurostar_regular.dat" + +FontB TEX "../Resources/Fonts/Bold/eurostar_regular_bold.png" +FontB FNT "../Resources/Fonts/Bold/eurostar_regular_bold.dat" + +FontO TEX "../Resources/Fonts/Outline 1/Outline 1.png" +FontO FNT "../Resources/Fonts/Outline 1/Outline 1.dat" + +FontO2 TEX "../Resources/Fonts/Outline 2/Outline 2.png" +FontO2 FNT "../Resources/Fonts/Outline 2/Outline 2.dat" + +MAINICON ICON "../Resources/Graphics/ustar-icon_v01.ico" +WINDOWICON TEX "../Resources/Graphics/ustar-icon.png" + +CRDTS_BG TEX "../Resources/Graphics/credits_v5_bg.png" +CRDTS_OVL TEX "../Resources/Graphics/credits_v5_overlay.png" +CRDTS_blindguard TEX "../Resources/Graphics/names_blindguard.png" +CRDTS_blindy TEX "../Resources/Graphics/names_blindy.png" +CRDTS_canni TEX "../Resources/Graphics/names_canni.png" +CRDTS_commandio TEX "../Resources/Graphics/names_commandio.png" +CRDTS_lazyjoker TEX "../Resources/Graphics/names_lazyjoker.png" +CRDTS_mog TEX "../Resources/Graphics/names_mog.png" +CRDTS_mota TEX "../Resources/Graphics/names_mota.png" +CRDTS_skillmaster TEX "../Resources/Graphics/names_skillmaster.png" +CRDTS_whiteshark TEX "../Resources/Graphics/names_whiteshark.png" +INTRO_L01 TEX "../Resources/Graphics/intro-l-01.png" +INTRO_L02 TEX "../Resources/Graphics/intro-l-02.png" +INTRO_L03 TEX "../Resources/Graphics/intro-l-03.png" +INTRO_L04 TEX "../Resources/Graphics/intro-l-04.png" +INTRO_L05 TEX "../Resources/Graphics/intro-l-05.png" +INTRO_L06 TEX "../Resources/Graphics/intro-l-06.png" +INTRO_L07 TEX "../Resources/Graphics/intro-l-07.png" +INTRO_L08 TEX "../Resources/Graphics/intro-l-08.png" +INTRO_L09 TEX "../Resources/Graphics/intro-l-09.png" +OUTRO_BG TEX "../Resources/Graphics/outro-bg.png" +OUTRO_ESC TEX "../Resources/Graphics/outro-esc.png" +OUTRO_EXD TEX "../Resources/Graphics/outro-exit-dark.png" -- cgit v1.2.3