aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile.in16
-rw-r--r--src/UltraStar.dpr294
-rw-r--r--src/UltraStar.lpi598
-rw-r--r--src/configure.ac10
-rw-r--r--src/lazres-UltraStar.bat2
-rw-r--r--src/ultrastardx-linux.lpi (renamed from src/UltraStar-linux.lpi)7
-rw-r--r--src/ultrastardx.dpr292
-rw-r--r--src/ultrastardx.lpi80
-rw-r--r--src/ultrastardx.lpr (renamed from src/UltraStar.lpr)2
-rw-r--r--src/ultrastardx.rc (renamed from src/UltraStar.rc)0
10 files changed, 389 insertions, 912 deletions
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.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 @@
-<?xml version="1.0"?>
-<CONFIG>
- <ProjectOptions>
- <PathDelim Value="\"/>
- <Version Value="6"/>
- <General>
- <Flags>
- <MainUnitHasCreateFormStatements Value="False"/>
- <MainUnitHasTitleStatement Value="False"/>
- <AlwaysBuild Value="False"/>
- </Flags>
- <SessionStorage Value="InProjectDir"/>
- <MainUnit Value="0"/>
- <IconPath Value=".\"/>
- <TargetFileExt Value=".exe"/>
- </General>
- <VersionInfo>
- <ProjectVersion Value=""/>
- </VersionInfo>
- <PublishOptions>
- <Version Value="2"/>
- <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
- <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
- </PublishOptions>
- <RunParams>
- <local>
- <FormatVersion Value="1"/>
- <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
- </local>
- </RunParams>
- <Units Count="121">
- <Unit0>
- <Filename Value="UltraStar.dpr"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UltraStar"/>
- </Unit0>
- <Unit1>
- <Filename Value="Screens\UScreenTop5.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenTop5"/>
- </Unit1>
- <Unit2>
- <Filename Value="..\..\Modis\SDK\UPartyDefs.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UPartyDefs"/>
- </Unit2>
- <Unit3>
- <Filename Value="..\..\Modis\SDK\UPluginDefs.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="uPluginDefs"/>
- </Unit3>
- <Unit4>
- <Filename Value="..\..\Modis\SDK\ModiSDK.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="ModiSDK"/>
- </Unit4>
- <Unit5>
- <Filename Value="Screens\UScreenPartyWin.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenPartyWin"/>
- </Unit5>
- <Unit6>
- <Filename Value="Classes\UMain.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UMain"/>
- </Unit6>
- <Unit7>
- <Filename Value="Classes\ULog.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="ULog"/>
- </Unit7>
- <Unit8>
- <Filename Value="Classes\UCommon.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UCommon"/>
- </Unit8>
- <Unit9>
- <Filename Value="Classes\UMusic.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UMusic"/>
- </Unit9>
- <Unit10>
- <Filename Value="Screens\UScreenScore.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenScore"/>
- </Unit10>
- <Unit11>
- <Filename Value="Screens\UScreenSong.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenSong"/>
- </Unit11>
- <Unit12>
- <Filename Value="lib\JEDI-SDL\OpenGL\Pas\opengl12.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="opengl12"/>
- </Unit12>
- <Unit13>
- <Filename Value="Classes\UAudioDecoder_FFMpeg.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UAudioDecoder_FFMpeg"/>
- </Unit13>
- <Unit14>
- <Filename Value="Menu\UMenu.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UMenu"/>
- </Unit14>
- <Unit15>
- <Filename Value="Screens\UScreenMain.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenMain"/>
- </Unit15>
- <Unit16>
- <Filename Value="Classes\UJoystick.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UJoystick"/>
- </Unit16>
- <Unit17>
- <Filename Value="Classes\USongs.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="USongs"/>
- </Unit17>
- <Unit18>
- <Filename Value="Classes\UGraphicClasses.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UGraphicClasses"/>
- </Unit18>
- <Unit19>
- <Filename Value="Classes\UTexture.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UTexture"/>
- </Unit19>
- <Unit20>
- <Filename Value="Classes\TextGL.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="TextGL"/>
- </Unit20>
- <Unit21>
- <Filename Value="Classes\UImage.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UImage"/>
- </Unit21>
- <Unit22>
- <Filename Value="lib\libpng\png.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="png"/>
- </Unit22>
- <Unit23>
- <Filename Value="lib\ffmpeg\avcodec.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="avcodec"/>
- </Unit23>
- <Unit24>
- <Filename Value="Menu\UDisplay.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UDisplay"/>
- </Unit24>
- <Unit25>
- <Filename Value="Classes\UThemes.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UThemes"/>
- </Unit25>
- <Unit26>
- <Filename Value="Classes\UParty.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UParty"/>
- </Unit26>
- <Unit27>
- <Filename Value="Screens\UScreenSing.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenSing"/>
- </Unit27>
- <Unit28>
- <Filename Value="Classes\USingScores.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="USingScores"/>
- </Unit28>
- <Unit29>
- <Filename Value="Classes\UGraphic.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UGraphic"/>
- </Unit29>
- <Unit30>
- <Filename Value="Screens\UScreenPopup.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenPopup"/>
- </Unit30>
- <Unit31>
- <Filename Value="lib\JEDI-SDL\SDL\Pas\moduleloader.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit31>
- <Unit32>
- <Filename Value="lib\JEDI-SDL\SDL\Pas\sdl.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit32>
- <Unit33>
- <Filename Value="lib\JEDI-SDL\SDL_Image\Pas\sdl_image.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit33>
- <Unit34>
- <Filename Value="lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit34>
- <Unit35>
- <Filename Value="lib\JEDI-SDL\SDL\Pas\sdlutils.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit35>
- <Unit36>
- <Filename Value="lib\zlib\zlib.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit36>
- <Unit37>
- <Filename Value="lib\portaudio\delphi\portaudio.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit37>
- <Unit38>
- <Filename Value="Classes\UAudioCore_Portaudio.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UAudioCore_Portaudio"/>
- </Unit38>
- <Unit39>
- <Filename Value="lib\ffmpeg\avformat.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="avformat"/>
- </Unit39>
- <Unit40>
- <Filename Value="lib\ffmpeg\avutil.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="avutil"/>
- </Unit40>
- <Unit41>
- <Filename Value="lib\ffmpeg\rational.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit41>
- <Unit42>
- <Filename Value="lib\ffmpeg\opt.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit42>
- <Unit43>
- <Filename Value="lib\ffmpeg\avio.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit43>
- <Unit44>
- <Filename Value="lib\ffmpeg\mathematics.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit44>
- <Unit45>
- <Filename Value="lib\ffmpeg\swscale.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit45>
- <Unit46>
- <Filename Value="lib\SQLite\SQLiteTable3.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit46>
- <Unit47>
- <Filename Value="lib\SQLite\SQLite3.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit47>
- <Unit48>
- <Filename Value="Menu\UMenuStatic.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit48>
- <Unit49>
- <Filename Value="Menu\UMenuText.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit49>
- <Unit50>
- <Filename Value="Menu\UMenuButton.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UMenuButton"/>
- </Unit50>
- <Unit51>
- <Filename Value="Menu\UMenuInteract.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit51>
- <Unit52>
- <Filename Value="Menu\UMenuSelect.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit52>
- <Unit53>
- <Filename Value="Menu\UMenuSelectSlide.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit53>
- <Unit54>
- <Filename Value="Menu\UDrawTexture.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit54>
- <Unit55>
- <Filename Value="Menu\UMenuButtonCollection.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit55>
- <Unit56>
- <Filename Value="Classes\UConfig.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit56>
- <Unit57>
- <Filename Value="Classes\ULanguage.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit57>
- <Unit58>
- <Filename Value="Classes\UDraw.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UDraw"/>
- </Unit58>
- <Unit59>
- <Filename Value="Classes\URecord.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit59>
- <Unit60>
- <Filename Value="Classes\UTime.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit60>
- <Unit61>
- <Filename Value="Classes\USong.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit61>
- <Unit62>
- <Filename Value="Classes\USong_TextFile.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit62>
- <Unit63>
- <Filename Value="Classes\USong_Txt.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit63>
- <Unit64>
- <Filename Value="Classes\UXMLSong.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit64>
- <Unit65>
- <Filename Value="Classes\UIni.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit65>
- <Unit66>
- <Filename Value="Classes\ULyrics.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="ULyrics"/>
- </Unit66>
- <Unit67>
- <Filename Value="Classes\ULyrics_bak.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit67>
- <Unit68>
- <Filename Value="Classes\USkins.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit68>
- <Unit69>
- <Filename Value="Classes\UDataBase.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit69>
- <Unit70>
- <Filename Value="Classes\UCovers.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit70>
- <Unit71>
- <Filename Value="Classes\UCatCovers.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit71>
- <Unit72>
- <Filename Value="Classes\UFiles.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit72>
- <Unit73>
- <Filename Value="Classes\UDLLManager.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit73>
- <Unit74>
- <Filename Value="Classes\UPlaylist.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit74>
- <Unit75>
- <Filename Value="Classes\UCommandLine.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit75>
- <Unit76>
- <Filename Value="Classes\UTextClasses.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit76>
- <Unit77>
- <Filename Value="Classes\USingNotes.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit77>
- <Unit78>
- <Filename Value="Classes\UModules.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit78>
- <Unit79>
- <Filename Value="Classes\UHooks.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit79>
- <Unit80>
- <Filename Value="Classes\UServices.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UServices"/>
- </Unit80>
- <Unit81>
- <Filename Value="Classes\UCore.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit81>
- <Unit82>
- <Filename Value="Classes\UCoreModule.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit82>
- <Unit83>
- <Filename Value="Classes\UPluginInterface.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit83>
- <Unit84>
- <Filename Value="Classes\uPluginLoader.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit84>
- <Unit85>
- <Filename Value="Classes\UPlatform.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit85>
- <Unit86>
- <Filename Value="Classes\UPlatformLinux.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit86>
- <Unit87>
- <Filename Value="Classes\UMedia_dummy.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit87>
- <Unit88>
- <Filename Value="Classes\UVideo.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UVideo"/>
- </Unit88>
- <Unit89>
- <Filename Value="Classes\UAudioInput_Portaudio.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit89>
- <Unit90>
- <Filename Value="lib\fft\ufft.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit90>
- <Unit91>
- <Filename Value="Classes\UAudioPlayback_SoftMixer.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UAudioPlayback_SoftMixer"/>
- </Unit91>
- <Unit92>
- <Filename Value="Classes\UAudioPlayback_SDL.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UAudioPlayback_SDL"/>
- </Unit92>
- <Unit93>
- <Filename Value="Screens\UScreenLoading.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit93>
- <Unit94>
- <Filename Value="Screens\UScreenWelcome.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit94>
- <Unit95>
- <Filename Value="Screens\UScreenName.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit95>
- <Unit96>
- <Filename Value="Screens\UScreenLevel.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit96>
- <Unit97>
- <Filename Value="Screens\UScreenOptions.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit97>
- <Unit98>
- <Filename Value="Screens\UScreenOptionsGame.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit98>
- <Unit99>
- <Filename Value="Screens\UScreenOptionsGraphics.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit99>
- <Unit100>
- <Filename Value="Screens\UScreenOptionsSound.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit100>
- <Unit101>
- <Filename Value="Screens\UScreenOptionsLyrics.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit101>
- <Unit102>
- <Filename Value="Screens\UScreenOptionsThemes.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit102>
- <Unit103>
- <Filename Value="Screens\UScreenOptionsRecord.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit103>
- <Unit104>
- <Filename Value="Screens\UScreenOptionsAdvanced.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit104>
- <Unit105>
- <Filename Value="Screens\UScreenEditSub.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit105>
- <Unit106>
- <Filename Value="Screens\UScreenEdit.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit106>
- <Unit107>
- <Filename Value="Screens\UScreenEditConvert.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit107>
- <Unit108>
- <Filename Value="Screens\UScreenEditHeader.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit108>
- <Unit109>
- <Filename Value="Screens\UScreenOpen.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit109>
- <Unit110>
- <Filename Value="Screens\UScreenSongMenu.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenSongMenu"/>
- </Unit110>
- <Unit111>
- <Filename Value="Screens\UScreenSongJumpto.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit111>
- <Unit112>
- <Filename Value="Screens\UScreenStatMain.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit112>
- <Unit113>
- <Filename Value="Screens\UScreenStatDetail.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit113>
- <Unit114>
- <Filename Value="Screens\UScreenCredits.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit114>
- <Unit115>
- <Filename Value="Screens\UScreenSingModi.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit115>
- <Unit116>
- <Filename Value="Screens\UScreenPartyNewRound.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit116>
- <Unit117>
- <Filename Value="Screens\UScreenPartyScore.pas"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UScreenPartyScore"/>
- </Unit117>
- <Unit118>
- <Filename Value="Screens\UScreenPartyPlayer.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit118>
- <Unit119>
- <Filename Value="Screens\UScreenPartyOptions.pas"/>
- <IsPartOfProject Value="True"/>
- </Unit119>
- <Unit120>
- <Filename Value="UltraStar.lpr"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="UltraStar"/>
- </Unit120>
- </Units>
- </ProjectOptions>
- <CompilerOptions>
- <Version Value="5"/>
- <PathDelim Value="\"/>
- <Target>
- <Filename Value="..\ultrastardx"/>
- </Target>
- <SearchPaths>
- <IncludeFiles Value="lib\JEDI-SDL\SDL\Pas\;Classes\;Menu\;Screens\;lib\JEDI-SDL\OpenGL\Pas\;lib\JEDI-SDL\SDL_Image\Pas\;lib\JEDI-SDL\SDL_ttf\Pas\;lib\SQLite\;lib\ffmpeg\;lib\fft\;lib\libpng\;lib\portaudio\delphi\;lib\zlib\;lib\pulseaudio\;\home\tobias\daten\Projekte\UltraStarDX\Kopie von trunk\Modis\SDK\"/>
- <Libraries Value="lib\JEDI-SDL\SDL\Pas\"/>
- <OtherUnitFiles Value="Classes\;Menu\;Screens\;lib\JEDI-SDL\SDL\Pas\;lib\JEDI-SDL\OpenGL\Pas\;lib\JEDI-SDL\SDL_Image\Pas\;lib\JEDI-SDL\SDL_ttf\Pas\;lib\SQLite\;lib\ffmpeg\;lib\fft\;lib\libpng\;lib\portaudio\delphi\;lib\zlib\"/>
- <UnitOutputDirectory Value="build\$(TargetOS)\fpc"/>
- <ObjectPath Value="lib\JEDI-SDL\SDL\Pas\"/>
- <SrcPath Value="Classes\;Menu\;Screens\;lib\libpng\;lib\JEDI-SDL\SDL\Pas\;lib\JEDI-SDL\OpenGL\Pas\;lib\bass\delphi\;lib\pulseaudio\"/>
- </SearchPaths>
- <Parsing>
- <SyntaxOptions>
- <CStyleOperator Value="False"/>
- <DelphiCompat Value="True"/>
- </SyntaxOptions>
- </Parsing>
- <CodeGeneration>
- <Generate Value="Faster"/>
- </CodeGeneration>
- <Other>
- <Verbosity>
- <ShowNotes Value="False"/>
- <ShowHints Value="False"/>
- <ShowGenInfo Value="False"/>
- </Verbosity>
- <CompilerPath Value="$(CompPath)"/>
- <ExecuteBefore>
- <Command Value="clean.bat"/>
- <CompileReasons Run="False"/>
- </ExecuteBefore>
- </Other>
- </CompilerOptions>
-</CONFIG>
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/UltraStar-linux.lpi b/src/ultrastardx-linux.lpi
index d3866f94..7ae60283 100644
--- a/src/UltraStar-linux.lpi
+++ b/src/ultrastardx-linux.lpi
@@ -30,7 +30,7 @@
</RunParams>
<Units Count="1">
<Unit0>
- <Filename Value="UltraStar.dpr"/>
+ <Filename Value="ultrastardx.dpr"/>
<IsPartOfProject Value="True"/>
</Unit0>
</Units>
@@ -38,13 +38,12 @@
<CompilerOptions>
<Version Value="5"/>
<Target>
- <Filename Value="../../ultrastardx"/>
+ <Filename Value="../ultrastardx"/>
</Target>
<SearchPaths>
<IncludeFiles Value="lib/JEDI-SDL/SDL/Pas/"/>
- <OtherUnitFiles Value="$(LazarusDir)/components/jpeg/lib/$(TargetCPU)-$(TargetOS)/;$(LazarusDir)/components/images/lib/$(TargetCPU)-$(TargetOS)/;$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/;$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)/;$(LazarusDir)/packager/units/$(TargetCPU)-$(TargetOS)/"/>
<UnitOutputDirectory Value="build/linux/lazarus"/>
- <SrcPath Value="Classes/;Menu/;Screens/;lib/"/>
+ <SrcPath Value="classes/;menu/;screens/;lib/"/>
</SearchPaths>
<Parsing>
<SyntaxOptions>
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 @@
+<?xml version="1.0"?>
+<CONFIG>
+ <ProjectOptions>
+ <PathDelim Value="\"/>
+ <Version Value="6"/>
+ <General>
+ <Flags>
+ <MainUnitHasCreateFormStatements Value="False"/>
+ <MainUnitHasTitleStatement Value="False"/>
+ <AlwaysBuild Value="False"/>
+ </Flags>
+ <SessionStorage Value="InProjectDir"/>
+ <MainUnit Value="0"/>
+ <IconPath Value=".\"/>
+ <TargetFileExt Value=".exe"/>
+ </General>
+ <VersionInfo>
+ <ProjectVersion Value=""/>
+ </VersionInfo>
+ <PublishOptions>
+ <Version Value="2"/>
+ <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
+ <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
+ </PublishOptions>
+ <RunParams>
+ <local>
+ <FormatVersion Value="1"/>
+ <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+ </local>
+ </RunParams>
+ <Units Count="2">
+ <Unit0>
+ <Filename Value="ultrastardx.dpr"/>
+ <IsPartOfProject Value="True"/>
+ <UnitName Value="ultrastardx"/>
+ </Unit0>
+ <Unit1>
+ <Filename Value="ultrastardx.lpr"/>
+ <IsPartOfProject Value="True"/>
+ <UnitName Value="ultrastardx"/>
+ </Unit1>
+ </Units>
+ </ProjectOptions>
+ <CompilerOptions>
+ <Version Value="5"/>
+ <PathDelim Value="\"/>
+ <Target>
+ <Filename Value="..\ultrastardx"/>
+ </Target>
+ <SearchPaths>
+ <IncludeFiles Value="lib\JEDI-SDL\SDL\Pas\;classes\;menu\;screens\;lib\JEDI-SDL\OpenGL\Pas\;lib\JEDI-SDL\SDL_Image\Pas\;lib\JEDI-SDL\SDL_ttf\Pas\;lib\SQLite\;lib\ffmpeg\;lib\fft\;lib\libpng\;lib\portaudio\delphi\;lib\zlib\;lib\pulseaudio\;..\plugins\SDK\"/>
+ <Libraries Value="lib\JEDI-SDL\SDL\Pas\"/>
+ <OtherUnitFiles Value="classes\;menu\;screens\;lib\JEDI-SDL\SDL\Pas\;lib\JEDI-SDL\OpenGL\Pas\;lib\JEDI-SDL\SDL_Image\Pas\;lib\JEDI-SDL\SDL_ttf\Pas\;lib\SQLite\;lib\ffmpeg\;lib\fft\;lib\libpng\;lib\portaudio\delphi\;lib\zlib\"/>
+ <UnitOutputDirectory Value="build\$(TargetOS)\fpc"/>
+ <ObjectPath Value="lib\JEDI-SDL\SDL\Pas\"/>
+ <SrcPath Value="classes\;menu\;screens\;lib\libpng\;lib\JEDI-SDL\SDL\Pas\;lib\JEDI-SDL\OpenGL\Pas\;lib\bass\delphi\;lib\pulseaudio\"/>
+ </SearchPaths>
+ <Parsing>
+ <SyntaxOptions>
+ <CStyleOperator Value="False"/>
+ <DelphiCompat Value="True"/>
+ </SyntaxOptions>
+ </Parsing>
+ <CodeGeneration>
+ <Generate Value="Faster"/>
+ </CodeGeneration>
+ <Other>
+ <Verbosity>
+ <ShowNotes Value="False"/>
+ <ShowHints Value="False"/>
+ <ShowGenInfo Value="False"/>
+ </Verbosity>
+ <CompilerPath Value="$(CompPath)"/>
+ <ExecuteBefore>
+ <Command Value="clean.bat"/>
+ <CompileReasons Run="False"/>
+ </ExecuteBefore>
+ </Other>
+ </CompilerOptions>
+</CONFIG>
diff --git a/src/UltraStar.lpr b/src/ultrastardx.lpr
index 66badecb..09a44f45 100644
--- a/src/UltraStar.lpr
+++ b/src/ultrastardx.lpr
@@ -15,5 +15,5 @@
//
// ***************************************************************************
-{$I UltraStar.dpr}
+{$I ultrastardx.dpr}
diff --git a/src/UltraStar.rc b/src/ultrastardx.rc
index 07061d4d..07061d4d 100644
--- a/src/UltraStar.rc
+++ b/src/ultrastardx.rc
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 00:23:40 +0000