From 678cc132f942ff4d84a803550eedf96acc543bca Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 23 May 2010 09:07:15 +0000 Subject: update to trunk rev. 2391 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2401 b956fd51-792f-4845-bead-9b4dfca2ff2c --- cmake/dists/delphi2005/readme.txt | 10 +- cmake/dists/delphi7/readme.txt | 10 +- cmake/dists/gentoo/readme.txt | 2 +- cmake/dists/gentoo/ultrastardx-1.1_beta.ebuild | 81 ++++++++ cmake/dists/lazarus/readme.txt | 30 +-- cmake/dists/lazarus/ultrastardx-unix.lpi | 248 +++++++++++++++---------- cmake/dists/lazarus/ultrastardx-win.lpi | 58 +++++- 7 files changed, 310 insertions(+), 129 deletions(-) create mode 100644 cmake/dists/gentoo/ultrastardx-1.1_beta.ebuild (limited to 'cmake/dists') diff --git a/cmake/dists/delphi2005/readme.txt b/cmake/dists/delphi2005/readme.txt index 2901b48a..64168d3c 100644 --- a/cmake/dists/delphi2005/readme.txt +++ b/cmake/dists/delphi2005/readme.txt @@ -1,5 +1,5 @@ -(Turbo-)Delphi 2005/2006 Project file --------------------------------------- -1. Copy ultrastardx.bdsproj to /src -2. Double-click /src/ultrastardx.bdsproj - +(Turbo-)Delphi 2005/2006 Project file +-------------------------------------- +1. Copy ultrastardx.bdsproj to /src +2. Double-click /src/ultrastardx.bdsproj + diff --git a/cmake/dists/delphi7/readme.txt b/cmake/dists/delphi7/readme.txt index 1ede3162..fa77699b 100644 --- a/cmake/dists/delphi7/readme.txt +++ b/cmake/dists/delphi7/readme.txt @@ -1,5 +1,5 @@ -Delphi 7 Project file --------------------------------------- -1. Copy ultrastardx.dof to /src -2. Double-click /src/ultrastardx.dpr - +Delphi 7 Project file +-------------------------------------- +1. Copy ultrastardx.dof to /src +2. Double-click /src/ultrastardx.dpr + diff --git a/cmake/dists/gentoo/readme.txt b/cmake/dists/gentoo/readme.txt index cf6dfcc1..982d42c9 100644 --- a/cmake/dists/gentoo/readme.txt +++ b/cmake/dists/gentoo/readme.txt @@ -3,7 +3,7 @@ --------------------------------------- This directory contains two ebuilds for UltraStar Deluxe - ultrastardx-9999.ebuild: a live ebuild using SVN sources -- ultrastardx-1.1_alpha.ebuild: a snapshot ebuild that might be appended to the official portage someday (Note: at the moment there is no source snapshot for USDX so this will not work) +- ultrastardx-1.1_beta.ebuild: a snapshot ebuild that might be appended to the official portage someday (Note: at the moment there is no source snapshot for USDX so this will not work) --------------------------------------- 2. Create a portage overlay diff --git a/cmake/dists/gentoo/ultrastardx-1.1_beta.ebuild b/cmake/dists/gentoo/ultrastardx-1.1_beta.ebuild new file mode 100644 index 00000000..efb52a54 --- /dev/null +++ b/cmake/dists/gentoo/ultrastardx-1.1_beta.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +inherit cmake-utils games + +SONGS_PKG=USDX-SongPackage +SONGS_VER=01 + +DESCRIPTION="An open-source karaoke game" +HOMEPAGE="http://www.ultrastardeluxe.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz + songs? ( mirror://sourceforge/${PN}/${SONGS_PKG}-${SONGS_VER}.zip )" + +LICENSE="GPL-2 + songs? ( + CCPL-Attribution-ShareAlike-NonCommercial-2.5 + CCPL-Attribution-NonCommercial-NoDerivs-2.5 + )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="projectm debug songs" + +RDEPEND="virtual/opengl + virtual/glu + media-libs/libsdl + media-libs/sdl-image + media-libs/freetype + media-libs/libpng + =media-libs/portaudio-19* + media-video/ffmpeg + dev-db/sqlite + projectm? ( media-libs/libprojectm )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-lang/fpc-2.2.2" + +S=${WORKDIR}/${P}-src + +pkg_setup() { + games_pkg_setup + built_with_use media-libs/libsdl opengl \ + || die "You need to compile media-libs/libsdl with USE=opengl." +} + +src_compile() { + # set build-type as the "Gentoo" build-type does not work with + # Pascal (no optimization, etc.) + if use debug ; then + CMAKE_BUILD_TYPE="Debug" + else + CMAKE_BUILD_TYPE="Release" + fi + + # set PREFIX so that CMAKE_INSTALL_PREFIX will be set to GAMES_PREFIX + PREFIX="${GAMES_PREFIX}" + + # configure flags + local mycmakeargs="$(cmake-utils_use_enable projectm PROJECTM) \ + $(cmake-utils_use_build plugins PLUGINS) \ + -DBINDIR=${GAMES_BINDIR} \ + -DDATADIR=${GAMES_DATADIR}/${PN}" + + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + + if use songs; then + insinto "${GAMES_DATADIR}"/${PN}/songs + doins -r ${WORKDIR}/Songs/* || die "doins songs failed" + fi + + dodoc AUTHORS.txt ChangeLog.german.txt ChangeLog.txt README.txt + + doicon icons/${PN}-icon.svg + make_desktop_entry ${PN} "UltraStar Deluxe" + + prepgamesdirs +} diff --git a/cmake/dists/lazarus/readme.txt b/cmake/dists/lazarus/readme.txt index c828266b..012ee37a 100755 --- a/cmake/dists/lazarus/readme.txt +++ b/cmake/dists/lazarus/readme.txt @@ -1,15 +1,15 @@ -Lazarus Project file --------------------------------------- - -Unix: - 1. Copy "ultrastardx-unix.lpi" to /src - (you may rename it to ultrastardx.lpi if you want) - 2. Start Lazarus, click on "Project -> Open Project ..." - and select "ultrastardx-unix.lpi" - -Windows: - 1. Copy "ultrastardx-win.lpi" to /src - (you may rename it to ultrastardx.lpi if you want) - 2. Copy "clean.bat" to /src - 3. Start Lazarus, click on "Project -> Open Project ..." - and select "ultrastardx-win.lpi" +Lazarus Project file +-------------------------------------- + +Unix: + 1. Copy "ultrastardx-unix.lpi" to /src + (you may rename it to ultrastardx.lpi if you want) + 2. Start Lazarus, click on "Project -> Open Project ..." + and select "ultrastardx-unix.lpi" + +Windows: + 1. Copy "ultrastardx-win.lpi" to /src + (you may rename it to ultrastardx.lpi if you want) + 2. Copy "clean.bat" to /src + 3. Start Lazarus, click on "Project -> Open Project ..." + and select "ultrastardx-win.lpi" diff --git a/cmake/dists/lazarus/ultrastardx-unix.lpi b/cmake/dists/lazarus/ultrastardx-unix.lpi index 0fab8fcd..4160f850 100644 --- a/cmake/dists/lazarus/ultrastardx-unix.lpi +++ b/cmake/dists/lazarus/ultrastardx-unix.lpi @@ -2,15 +2,15 @@ - + + - </General> @@ -29,7 +29,7 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <Units Count="118"> + <Units Count="127"> <Unit0> <Filename Value="ultrastardx.dpr"/> <IsPartOfProject Value="True"/> @@ -130,381 +130,431 @@ <Unit24> <Filename Value="base/UMain.pas"/> <IsPartOfProject Value="True"/> + <UnitName Value="UMain"/> </Unit24> <Unit25> - <Filename Value="base/UModules.pas"/> + <Filename Value="base/UMusic.pas"/> <IsPartOfProject Value="True"/> </Unit25> <Unit26> - <Filename Value="base/UMusic.pas"/> + <Filename Value="base/UParty.pas"/> <IsPartOfProject Value="True"/> </Unit26> <Unit27> - <Filename Value="base/UParty.pas"/> + <Filename Value="base/UPlatform.pas"/> <IsPartOfProject Value="True"/> </Unit27> <Unit28> - <Filename Value="base/UPlatform.pas"/> + <Filename Value="base/UPlatformLinux.pas"/> <IsPartOfProject Value="True"/> </Unit28> <Unit29> - <Filename Value="base/UPlatformLinux.pas"/> + <Filename Value="base/UPlatformMacOSX.pas"/> <IsPartOfProject Value="True"/> </Unit29> <Unit30> - <Filename Value="base/UPlatformMacOSX.pas"/> + <Filename Value="base/UPlatformWindows.pas"/> <IsPartOfProject Value="True"/> </Unit30> <Unit31> - <Filename Value="base/UPlatformWindows.pas"/> + <Filename Value="base/UPlaylist.pas"/> <IsPartOfProject Value="True"/> </Unit31> <Unit32> - <Filename Value="base/UPlaylist.pas"/> + <Filename Value="base/UPluginInterface.pas"/> <IsPartOfProject Value="True"/> </Unit32> <Unit33> - <Filename Value="base/UPluginInterface.pas"/> + <Filename Value="base/UPluginLoader.pas"/> <IsPartOfProject Value="True"/> </Unit33> <Unit34> - <Filename Value="base/UPluginLoader.pas"/> + <Filename Value="base/URecord.pas"/> <IsPartOfProject Value="True"/> </Unit34> <Unit35> - <Filename Value="base/URecord.pas"/> + <Filename Value="base/URingBuffer.pas"/> <IsPartOfProject Value="True"/> </Unit35> <Unit36> - <Filename Value="base/URingBuffer.pas"/> + <Filename Value="base/UServices.pas"/> <IsPartOfProject Value="True"/> </Unit36> <Unit37> - <Filename Value="base/UServices.pas"/> + <Filename Value="base/USingNotes.pas"/> <IsPartOfProject Value="True"/> </Unit37> <Unit38> - <Filename Value="base/USingNotes.pas"/> + <Filename Value="base/USingScores.pas"/> <IsPartOfProject Value="True"/> </Unit38> <Unit39> - <Filename Value="base/USingScores.pas"/> + <Filename Value="base/USkins.pas"/> <IsPartOfProject Value="True"/> </Unit39> <Unit40> - <Filename Value="base/USkins.pas"/> + <Filename Value="base/USong.pas"/> <IsPartOfProject Value="True"/> </Unit40> <Unit41> - <Filename Value="base/USong.pas"/> + <Filename Value="base/USongs.pas"/> <IsPartOfProject Value="True"/> </Unit41> <Unit42> - <Filename Value="base/USongs.pas"/> + <Filename Value="base/UTextClasses.pas"/> <IsPartOfProject Value="True"/> </Unit42> <Unit43> - <Filename Value="base/UTextClasses.pas"/> + <Filename Value="base/UTexture.pas"/> <IsPartOfProject Value="True"/> </Unit43> <Unit44> - <Filename Value="base/UTexture.pas"/> + <Filename Value="base/UThemes.pas"/> <IsPartOfProject Value="True"/> + <UnitName Value="UThemes"/> </Unit44> <Unit45> - <Filename Value="base/UThemes.pas"/> + <Filename Value="base/UTime.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="UThemes"/> + <UnitName Value="UTime"/> </Unit45> <Unit46> - <Filename Value="base/UTime.pas"/> + <Filename Value="base/UXMLSong.pas"/> <IsPartOfProject Value="True"/> </Unit46> <Unit47> - <Filename Value="base/UXMLSong.pas"/> + <Filename Value="menu/UDisplay.pas"/> <IsPartOfProject Value="True"/> </Unit47> <Unit48> - <Filename Value="menu/UDisplay.pas"/> + <Filename Value="menu/UDrawTexture.pas"/> <IsPartOfProject Value="True"/> </Unit48> <Unit49> - <Filename Value="menu/UDrawTexture.pas"/> + <Filename Value="menu/UMenu.pas"/> <IsPartOfProject Value="True"/> </Unit49> <Unit50> - <Filename Value="menu/UMenu.pas"/> + <Filename Value="menu/UMenuBackground.pas"/> <IsPartOfProject Value="True"/> </Unit50> <Unit51> - <Filename Value="menu/UMenuBackground.pas"/> + <Filename Value="menu/UMenuBackgroundColor.pas"/> <IsPartOfProject Value="True"/> </Unit51> <Unit52> - <Filename Value="menu/UMenuBackgroundColor.pas"/> + <Filename Value="menu/UMenuBackgroundFade.pas"/> <IsPartOfProject Value="True"/> </Unit52> <Unit53> - <Filename Value="menu/UMenuBackgroundFade.pas"/> + <Filename Value="menu/UMenuBackgroundNone.pas"/> <IsPartOfProject Value="True"/> </Unit53> <Unit54> - <Filename Value="menu/UMenuBackgroundNone.pas"/> + <Filename Value="menu/UMenuBackgroundTexture.pas"/> <IsPartOfProject Value="True"/> </Unit54> <Unit55> - <Filename Value="menu/UMenuBackgroundTexture.pas"/> + <Filename Value="menu/UMenuBackgroundVideo.pas"/> <IsPartOfProject Value="True"/> </Unit55> <Unit56> - <Filename Value="menu/UMenuBackgroundVideo.pas"/> + <Filename Value="menu/UMenuButton.pas"/> <IsPartOfProject Value="True"/> </Unit56> <Unit57> - <Filename Value="menu/UMenuButton.pas"/> + <Filename Value="menu/UMenuButtonCollection.pas"/> <IsPartOfProject Value="True"/> </Unit57> <Unit58> - <Filename Value="menu/UMenuButtonCollection.pas"/> + <Filename Value="menu/UMenuEqualizer.pas"/> <IsPartOfProject Value="True"/> </Unit58> <Unit59> - <Filename Value="menu/UMenuEqualizer.pas"/> + <Filename Value="menu/UMenuInteract.pas"/> <IsPartOfProject Value="True"/> </Unit59> <Unit60> - <Filename Value="menu/UMenuInteract.pas"/> + <Filename Value="menu/UMenuSelectSlide.pas"/> <IsPartOfProject Value="True"/> </Unit60> <Unit61> - <Filename Value="menu/UMenuSelectSlide.pas"/> + <Filename Value="menu/UMenuStatic.pas"/> <IsPartOfProject Value="True"/> </Unit61> <Unit62> - <Filename Value="menu/UMenuStatic.pas"/> + <Filename Value="menu/UMenuText.pas"/> <IsPartOfProject Value="True"/> </Unit62> <Unit63> - <Filename Value="menu/UMenuText.pas"/> + <Filename Value="screens/UScreenCredits.pas"/> <IsPartOfProject Value="True"/> + <UnitName Value="UScreenCredits"/> </Unit63> <Unit64> - <Filename Value="screens/UScreenCredits.pas"/> + <Filename Value="screens/UScreenEdit.pas"/> <IsPartOfProject Value="True"/> - <UnitName Value="UScreenCredits"/> </Unit64> <Unit65> - <Filename Value="screens/UScreenEdit.pas"/> + <Filename Value="screens/UScreenEditConvert.pas"/> <IsPartOfProject Value="True"/> </Unit65> <Unit66> - <Filename Value="screens/UScreenEditConvert.pas"/> + <Filename Value="screens/UScreenEditHeader.pas"/> <IsPartOfProject Value="True"/> </Unit66> <Unit67> - <Filename Value="screens/UScreenEditHeader.pas"/> + <Filename Value="screens/UScreenEditSub.pas"/> <IsPartOfProject Value="True"/> </Unit67> <Unit68> - <Filename Value="screens/UScreenEditSub.pas"/> + <Filename Value="screens/UScreenLevel.pas"/> <IsPartOfProject Value="True"/> </Unit68> <Unit69> - <Filename Value="screens/UScreenLevel.pas"/> + <Filename Value="screens/UScreenLoading.pas"/> <IsPartOfProject Value="True"/> </Unit69> <Unit70> - <Filename Value="screens/UScreenLoading.pas"/> + <Filename Value="screens/UScreenMain.pas"/> <IsPartOfProject Value="True"/> </Unit70> <Unit71> - <Filename Value="screens/UScreenMain.pas"/> + <Filename Value="screens/UScreenName.pas"/> <IsPartOfProject Value="True"/> </Unit71> <Unit72> - <Filename Value="screens/UScreenName.pas"/> + <Filename Value="screens/UScreenOpen.pas"/> <IsPartOfProject Value="True"/> </Unit72> <Unit73> - <Filename Value="screens/UScreenOpen.pas"/> + <Filename Value="screens/UScreenOptions.pas"/> <IsPartOfProject Value="True"/> </Unit73> <Unit74> - <Filename Value="screens/UScreenOptions.pas"/> + <Filename Value="screens/UScreenOptionsAdvanced.pas"/> <IsPartOfProject Value="True"/> </Unit74> <Unit75> - <Filename Value="screens/UScreenOptionsAdvanced.pas"/> + <Filename Value="screens/UScreenOptionsGame.pas"/> <IsPartOfProject Value="True"/> </Unit75> <Unit76> - <Filename Value="screens/UScreenOptionsGame.pas"/> + <Filename Value="screens/UScreenOptionsGraphics.pas"/> <IsPartOfProject Value="True"/> </Unit76> <Unit77> - <Filename Value="screens/UScreenOptionsGraphics.pas"/> + <Filename Value="screens/UScreenOptionsLyrics.pas"/> <IsPartOfProject Value="True"/> </Unit77> <Unit78> - <Filename Value="screens/UScreenOptionsLyrics.pas"/> + <Filename Value="screens/UScreenOptionsRecord.pas"/> <IsPartOfProject Value="True"/> </Unit78> <Unit79> - <Filename Value="screens/UScreenOptionsRecord.pas"/> + <Filename Value="screens/UScreenOptionsSound.pas"/> <IsPartOfProject Value="True"/> </Unit79> <Unit80> - <Filename Value="screens/UScreenOptionsSound.pas"/> + <Filename Value="screens/UScreenOptionsThemes.pas"/> <IsPartOfProject Value="True"/> </Unit80> <Unit81> - <Filename Value="screens/UScreenOptionsThemes.pas"/> + <Filename Value="screens/UScreenPartyNewRound.pas"/> <IsPartOfProject Value="True"/> </Unit81> <Unit82> - <Filename Value="screens/UScreenPartyNewRound.pas"/> + <Filename Value="screens/UScreenPartyOptions.pas"/> <IsPartOfProject Value="True"/> </Unit82> <Unit83> - <Filename Value="screens/UScreenPartyOptions.pas"/> + <Filename Value="screens/UScreenPartyPlayer.pas"/> <IsPartOfProject Value="True"/> </Unit83> <Unit84> - <Filename Value="screens/UScreenPartyPlayer.pas"/> + <Filename Value="screens/UScreenPartyScore.pas"/> <IsPartOfProject Value="True"/> </Unit84> <Unit85> - <Filename Value="screens/UScreenPartyScore.pas"/> + <Filename Value="screens/UScreenPartyWin.pas"/> <IsPartOfProject Value="True"/> </Unit85> <Unit86> - <Filename Value="screens/UScreenPartyWin.pas"/> + <Filename Value="screens/UScreenPopup.pas"/> <IsPartOfProject Value="True"/> </Unit86> <Unit87> - <Filename Value="screens/UScreenPopup.pas"/> + <Filename Value="screens/UScreenScore.pas"/> <IsPartOfProject Value="True"/> </Unit87> <Unit88> - <Filename Value="screens/UScreenScore.pas"/> + <Filename Value="screens/UScreenSing.pas"/> <IsPartOfProject Value="True"/> </Unit88> <Unit89> - <Filename Value="screens/UScreenSing.pas"/> + <Filename Value="screens/UScreenSingModi.pas"/> <IsPartOfProject Value="True"/> </Unit89> <Unit90> - <Filename Value="screens/UScreenSingModi.pas"/> + <Filename Value="screens/UScreenSong.pas"/> <IsPartOfProject Value="True"/> </Unit90> <Unit91> - <Filename Value="screens/UScreenSong.pas"/> + <Filename Value="screens/UScreenSongJumpto.pas"/> <IsPartOfProject Value="True"/> </Unit91> <Unit92> - <Filename Value="screens/UScreenSongJumpto.pas"/> + <Filename Value="screens/UScreenSongMenu.pas"/> <IsPartOfProject Value="True"/> </Unit92> <Unit93> - <Filename Value="screens/UScreenSongMenu.pas"/> + <Filename Value="screens/UScreenStatDetail.pas"/> <IsPartOfProject Value="True"/> </Unit93> <Unit94> - <Filename Value="screens/UScreenStatDetail.pas"/> + <Filename Value="screens/UScreenStatMain.pas"/> <IsPartOfProject Value="True"/> </Unit94> <Unit95> - <Filename Value="screens/UScreenStatMain.pas"/> + <Filename Value="screens/UScreenTop5.pas"/> <IsPartOfProject Value="True"/> </Unit95> <Unit96> - <Filename Value="screens/UScreenTop5.pas"/> + <Filename Value="screens/UScreenWelcome.pas"/> <IsPartOfProject Value="True"/> </Unit96> <Unit97> - <Filename Value="screens/UScreenWelcome.pas"/> + <Filename Value="media/UAudioConverter.pas"/> <IsPartOfProject Value="True"/> </Unit97> <Unit98> - <Filename Value="media/UAudioConverter.pas"/> + <Filename Value="media/UAudioCore_Bass.pas"/> <IsPartOfProject Value="True"/> </Unit98> <Unit99> - <Filename Value="media/UAudioCore_Bass.pas"/> + <Filename Value="media/UAudioCore_Portaudio.pas"/> <IsPartOfProject Value="True"/> </Unit99> <Unit100> - <Filename Value="media/UAudioCore_Portaudio.pas"/> + <Filename Value="media/UAudioDecoder_Bass.pas"/> <IsPartOfProject Value="True"/> </Unit100> <Unit101> - <Filename Value="media/UAudioDecoder_Bass.pas"/> + <Filename Value="media/UAudioDecoder_FFmpeg.pas"/> <IsPartOfProject Value="True"/> </Unit101> <Unit102> - <Filename Value="media/UAudioDecoder_FFmpeg.pas"/> + <Filename Value="media/UAudioInput_Bass.pas"/> <IsPartOfProject Value="True"/> </Unit102> <Unit103> - <Filename Value="media/UAudioInput_Bass.pas"/> + <Filename Value="media/UAudioInput_Portaudio.pas"/> <IsPartOfProject Value="True"/> </Unit103> <Unit104> - <Filename Value="media/UAudioInput_Portaudio.pas"/> + <Filename Value="media/UAudioPlaybackBase.pas"/> <IsPartOfProject Value="True"/> </Unit104> <Unit105> - <Filename Value="media/UAudioPlaybackBase.pas"/> + <Filename Value="media/UAudioPlayback_Bass.pas"/> <IsPartOfProject Value="True"/> </Unit105> <Unit106> - <Filename Value="media/UAudioPlayback_Bass.pas"/> + <Filename Value="media/UAudioPlayback_Portaudio.pas"/> <IsPartOfProject Value="True"/> </Unit106> <Unit107> - <Filename Value="media/UAudioPlayback_Portaudio.pas"/> + <Filename Value="media/UAudioPlayback_SDL.pas"/> <IsPartOfProject Value="True"/> </Unit107> <Unit108> - <Filename Value="media/UAudioPlayback_SDL.pas"/> + <Filename Value="media/UAudioPlayback_SoftMixer.pas"/> <IsPartOfProject Value="True"/> </Unit108> <Unit109> - <Filename Value="media/UAudioPlayback_SoftMixer.pas"/> + <Filename Value="media/UMediaCore_FFmpeg.pas"/> <IsPartOfProject Value="True"/> </Unit109> <Unit110> - <Filename Value="media/UMediaCore_FFmpeg.pas"/> + <Filename Value="media/UMediaCore_SDL.pas"/> <IsPartOfProject Value="True"/> </Unit110> <Unit111> - <Filename Value="media/UMediaCore_SDL.pas"/> + <Filename Value="media/UMedia_dummy.pas"/> <IsPartOfProject Value="True"/> </Unit111> <Unit112> - <Filename Value="media/UMedia_dummy.pas"/> + <Filename Value="media/UVideo.pas"/> <IsPartOfProject Value="True"/> + <UnitName Value="UVideo"/> </Unit112> <Unit113> - <Filename Value="media/UVideo.pas"/> + <Filename Value="media/UVisualizer.pas"/> <IsPartOfProject Value="True"/> + <UnitName Value="UVisualizer"/> </Unit113> <Unit114> - <Filename Value="media/UVisualizer.pas"/> + <Filename Value="config-linux.inc"/> <IsPartOfProject Value="True"/> </Unit114> <Unit115> - <Filename Value="config-linux.inc"/> + <Filename Value="paths.inc"/> <IsPartOfProject Value="True"/> </Unit115> <Unit116> - <Filename Value="paths.inc"/> + <Filename Value="switches.inc"/> <IsPartOfProject Value="True"/> </Unit116> <Unit117> - <Filename Value="switches.inc"/> + <Filename Value="lua/UHookableEvent.pas"/> <IsPartOfProject Value="True"/> + <UnitName Value="UHookableEvent"/> </Unit117> + <Unit118> + <Filename Value="lua/ULuaCore.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaCore"/> + </Unit118> + <Unit119> + <Filename Value="lua/ULuaGl.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaGl"/> + </Unit119> + <Unit120> + <Filename Value="lua/ULuaLog.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaLog"/> + </Unit120> + <Unit121> + <Filename Value="lua/ULuaParty.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaParty"/> + </Unit121> + <Unit122> + <Filename Value="lua/ULuaScreenSing.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaScreenSing"/> + </Unit122> + <Unit123> + <Filename Value="lua/ULuaTextGL.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaTextGL"/> + </Unit123> + <Unit124> + <Filename Value="lua/ULuaTexture.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaTexture"/> + </Unit124> + <Unit125> + <Filename Value="lua/ULuaUsdx.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaUsdx"/> + </Unit125> + <Unit126> + <Filename Value="lua/ULuaUtils.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaUtils"/> + </Unit126> </Units> </ProjectOptions> <CompilerOptions> @@ -514,8 +564,8 @@ </Target> <SearchPaths> <IncludeFiles Value="lib/JEDI-SDL/SDL/Pas/"/> + <OtherUnitFiles Value="base/;menu/;screens/;media/;lib/;lua/"/> <UnitOutputDirectory Value="../build/fpc-$(TargetCPU)-$(TargetOS)"/> - <SrcPath Value="base/;menu/;screens/;media/;lib/"/> </SearchPaths> <Parsing> <SyntaxOptions> diff --git a/cmake/dists/lazarus/ultrastardx-win.lpi b/cmake/dists/lazarus/ultrastardx-win.lpi index a049cd10..acce323b 100644 --- a/cmake/dists/lazarus/ultrastardx-win.lpi +++ b/cmake/dists/lazarus/ultrastardx-win.lpi @@ -2,16 +2,16 @@ <CONFIG> <ProjectOptions> <PathDelim Value="\"/> - <Version Value="6"/> + <Version Value="7"/> <General> <Flags> <MainUnitHasCreateFormStatements Value="False"/> <MainUnitHasTitleStatement Value="False"/> <AlwaysBuild Value="False"/> + <LRSInOutputDirectory Value="False"/> </Flags> <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> - <IconPath Value="./"/> <TargetFileExt Value=".exe"/> <Title Value="ultrastardx"/> </General> @@ -30,7 +30,7 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <Units Count="117"> + <Units Count="127"> <Unit0> <Filename Value="ultrastardx.dpr"/> <IsPartOfProject Value="True"/> @@ -500,6 +500,56 @@ <Filename Value="config-win.inc"/> <IsPartOfProject Value="True"/> </Unit116> + <Unit117> + <Filename Value="lua\ULuaUtils.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaUtils"/> + </Unit117> + <Unit118> + <Filename Value="lua\UHookableEvent.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="UHookableEvent"/> + </Unit118> + <Unit119> + <Filename Value="lua\ULuaCore.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaCore"/> + </Unit119> + <Unit120> + <Filename Value="lua\ULuaGl.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaGl"/> + </Unit120> + <Unit121> + <Filename Value="lua\ULuaLog.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaLog"/> + </Unit121> + <Unit122> + <Filename Value="lua\ULuaParty.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaParty"/> + </Unit122> + <Unit123> + <Filename Value="lua\ULuaScreenSing.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaScreenSing"/> + </Unit123> + <Unit124> + <Filename Value="lua\ULuaTextGL.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaTextGL"/> + </Unit124> + <Unit125> + <Filename Value="lua\ULuaTexture.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaTexture"/> + </Unit125> + <Unit126> + <Filename Value="lua\ULuaUsdx.pas"/> + <IsPartOfProject Value="True"/> + <UnitName Value="ULuaUsdx"/> + </Unit126> </Units> </ProjectOptions> <CompilerOptions> @@ -510,8 +560,8 @@ </Target> <SearchPaths> <IncludeFiles Value="lib\JEDI-SDL\SDL\Pas\"/> + <OtherUnitFiles Value="base\;lua\;media\;menu\;screens\;lib\JEDI-SDL\SDL\Pas\;lib\JEDI-SDL\SDL_Image\Pas\;lib\JEDI-SDL\OpenGL\Pas\;lib\portaudio\;lib\ffmpeg\;lib\SQLite\;lib\other\"/> <UnitOutputDirectory Value="..\build\fpc-$(TargetCPU)-$(TargetOS)"/> - <SrcPath Value="base\;menu\;screens\;media\;lib\JEDI-SDL\SDL\Pas\;lib\JEDI-SDL\SDL_Image\Pas\;lib\JEDI-SDL\OpenGL\Pas\;lib\portaudio\;lib\ffmpeg\;lib\SQLite\;lib\other\"/> </SearchPaths> <Parsing> <SyntaxOptions> -- cgit v1.2.3