aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-11-03 03:13:44 +0000
committerjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-11-03 03:13:44 +0000
commit85313ec4dcc1591dbf1ecf6fa76294080354ed2a (patch)
treeccf619c7368e6df0840b36a87086e63505c9df80
parentcd4710574dd911e9f82586b093c10758693bfc3e (diff)
downloadusdx-85313ec4dcc1591dbf1ecf6fa76294080354ed2a.tar.gz
usdx-85313ec4dcc1591dbf1ecf6fa76294080354ed2a.tar.xz
usdx-85313ec4dcc1591dbf1ecf6fa76294080354ed2a.zip
another attempt..
( me to lazy to boot my linux dev box .. ) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@562 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Game/Code/USDXResCompiler.exebin1698394 -> 1698394 bytes
-rw-r--r--Game/Code/UltraStar.dpr2
-rw-r--r--Tools/USDXResCompiler.lpi154
3 files changed, 79 insertions, 77 deletions
diff --git a/Game/Code/USDXResCompiler.exe b/Game/Code/USDXResCompiler.exe
index b18e11a9..43e7fc8a 100644
--- a/Game/Code/USDXResCompiler.exe
+++ b/Game/Code/USDXResCompiler.exe
Binary files differ
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 3ece5395..4695ae4e 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -18,9 +18,9 @@ uses
sdl_ttf in 'lib\JEDI-SDLv1.0\SDL_ttf\Pas\sdl_ttf.pas',
sdlutils in 'lib\JEDI-SDLv1.0\SDL\Pas\sdlutils.pas',
+ {$ifdef delphi}
bass in 'lib\bass\delphi\bass.pas',
- {$ifdef delphi}
midiout in 'lib\midi\midiout.pas',
midiin in 'lib\midi\midiin.pas',
CIRCBUF in 'lib\midi\CIRCBUF.PAS',
diff --git a/Tools/USDXResCompiler.lpi b/Tools/USDXResCompiler.lpi
index c48a0e88..cf94486e 100644
--- a/Tools/USDXResCompiler.lpi
+++ b/Tools/USDXResCompiler.lpi
@@ -1,76 +1,78 @@
-<?xml version="1.0"?>
-<CONFIG>
- <ProjectOptions>
- <PathDelim Value="/"/>
- <Version Value="5"/>
- <General>
- <MainUnit Value="0"/>
- <IconPath Value="./"/>
- <TargetFileExt Value=".exe"/>
- <ActiveEditorIndexAtStart Value="0"/>
- </General>
- <VersionInfo>
- <ProjectVersion Value=""/>
- <Language Value=""/>
- <CharSet Value=""/>
- </VersionInfo>
- <PublishOptions>
- <Version Value="2"/>
- <IgnoreBinaries Value="False"/>
- <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>
- <RequiredPackages Count="1">
- <Item1>
- <PackageName Value="lcl"/>
- </Item1>
- </RequiredPackages>
- <Units Count="2">
- <Unit0>
- <Filename Value="USDXResCompiler.lpr"/>
- <IsPartOfProject Value="True"/>
- <UnitName Value="USDXResCompiler"/>
- <CursorPos X="48" Y="74"/>
- <TopLine Value="42"/>
- <EditorIndex Value="0"/>
- <UsageCount Value="24"/>
- <Loaded Value="True"/>
- </Unit0>
- <Unit1>
- <Filename Value="../../../../lazarus/lcl/lresources.pp"/>
- <UnitName Value="LResources"/>
- <CursorPos X="31" Y="55"/>
- <TopLine Value="36"/>
- <UsageCount Value="10"/>
- </Unit1>
- </Units>
- <JumpHistory Count="0" HistoryIndex="-1"/>
- </ProjectOptions>
- <CompilerOptions>
- <Version Value="5"/>
- <CodeGeneration>
- <Generate Value="Faster"/>
- </CodeGeneration>
- <Other>
- <CompilerPath Value="$(CompPath)"/>
- </Other>
- </CompilerOptions>
- <Debugging>
- <BreakPoints Count="2">
- <Item1>
- <Source Value="USDXResCompiler.lpr"/>
- <Line Value="14"/>
- </Item1>
- <Item2>
- <Source Value="USDXResCompiler.lpr"/>
- <Line Value="18"/>
- </Item2>
- </BreakPoints>
- </Debugging>
-</CONFIG>
+<?xml version="1.0"?>
+<CONFIG>
+ <ProjectOptions>
+ <PathDelim Value="\"/>
+ <Version Value="5"/>
+ <General>
+ <MainUnit Value="0"/>
+ <IconPath Value="./"/>
+ <TargetFileExt Value=".exe"/>
+ <ActiveEditorIndexAtStart Value="0"/>
+ </General>
+ <VersionInfo>
+ <ProjectVersion Value=""/>
+ <Language Value=""/>
+ <CharSet Value=""/>
+ </VersionInfo>
+ <PublishOptions>
+ <Version Value="2"/>
+ <DestinationDirectory Value="$(TestDir)\publishedproject\"/>
+ <IgnoreBinaries Value="False"/>
+ <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>
+ <RequiredPackages Count="1">
+ <Item1>
+ <PackageName Value="lcl"/>
+ </Item1>
+ </RequiredPackages>
+ <Units Count="2">
+ <Unit0>
+ <Filename Value="USDXResCompiler.lpr"/>
+ <IsPartOfProject Value="True"/>
+ <UnitName Value="USDXResCompiler"/>
+ <CursorPos X="48" Y="74"/>
+ <TopLine Value="42"/>
+ <EditorIndex Value="0"/>
+ <UsageCount Value="24"/>
+ <Loaded Value="True"/>
+ </Unit0>
+ <Unit1>
+ <Filename Value="..\..\..\..\lazarus\lcl\lresources.pp"/>
+ <UnitName Value="LResources"/>
+ <CursorPos X="31" Y="55"/>
+ <TopLine Value="36"/>
+ <UsageCount Value="10"/>
+ </Unit1>
+ </Units>
+ <JumpHistory Count="0" HistoryIndex="-1"/>
+ </ProjectOptions>
+ <CompilerOptions>
+ <Version Value="5"/>
+ <PathDelim Value="\"/>
+ <CodeGeneration>
+ <Generate Value="Faster"/>
+ </CodeGeneration>
+ <Other>
+ <CompilerPath Value="$(CompPath)"/>
+ </Other>
+ </CompilerOptions>
+ <Debugging>
+ <BreakPoints Count="2">
+ <Item1>
+ <Source Value="USDXResCompiler.lpr"/>
+ <Line Value="14"/>
+ </Item1>
+ <Item2>
+ <Source Value="USDXResCompiler.lpr"/>
+ <Line Value="18"/>
+ </Item2>
+ </BreakPoints>
+ </Debugging>
+</CONFIG>