aksdb
/
CentrED
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

* Fixed build modes 

* Fixed windows build (RT_RCDATA was missing)
This commit is contained in:
Andreas Schneider 2015-05-10 18:45:06 +02:00
parent 484bd5523f
commit 699fb78d72
3 changed files with 15 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Client/CentrED.lpi
View File

@ -23,7 +23,7 @@
</VersionInfo>
<BuildModes Count="7">
<Item1 Name="default" Default="True"/>
<Item2 Name="Release Win32">
<Item2 Name="Release.Win32">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="win32"/>
</MacroValues>
@ -72,7 +72,7 @@
</Other>
</CompilerOptions>
</Item2>
<Item3 Name="Release Linux x86">
<Item3 Name="Release.Linux.x86">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
@ -121,7 +121,7 @@
</Other>
</CompilerOptions>
</Item3>
<Item4 Name="Release Linux x64">
<Item4 Name="Release.Linux.x64">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
@ -170,7 +170,7 @@
</Other>
</CompilerOptions>
</Item4>
<Item5 Name="Debug Win32">
<Item5 Name="Debug.Win32">
<MacroValues Count="1">
<Macro1 Name="LCLWidgetType" Value="win32"/>
</MacroValues>
@ -203,7 +203,7 @@
</Other>
</CompilerOptions>
</Item5>
<Item6 Name="Debug Linux x86">
<Item6 Name="Debug.Linux.x86">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
@ -237,7 +237,7 @@
</Other>
</CompilerOptions>
</Item6>
<Item7 Name="Debug Linux x64">
<Item7 Name="Debug.Linux.x64">
<MacroValues Count="1">
<Macro2 Name="LCLWidgetType" Value="gtk2"/>
</MacroValues>
@ -272,8 +272,8 @@
</CompilerOptions>
</Item7>
<SharedMatrixOptions Count="2">
<Item1 ID="851019893220" Modes="Release Win32,Debug Win32" Type="IDEMacro" MacroName="LCLWidgetType" Value="win32"/>
<Item2 ID="521965364444" Modes="Release Linux x86,Release Linux x64,Debug Linux x86,Debug Linux x64" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
<Item1 ID="851019893220" Modes="Release.Win32,Debug.Win32" Type="IDEMacro" MacroName="LCLWidgetType" Value="win32"/>
<Item2 ID="521965364444" Modes="Release.Linux.x86,Release.Linux.x64,Debug.Linux.x86,Debug.Linux.x64" Type="IDEMacro" MacroName="LCLWidgetType" Value="gtk2"/>
</SharedMatrixOptions>
</BuildModes>
<PublishOptions>

2
Client/UOverlayUI.pas
View File

@ -30,7 +30,7 @@ unit UOverlayUI;
interface
uses
Classes, SysUtils, Gl, GLU, Imaging, ImagingTypes, ImagingClasses,
Classes, SysUtils, LCLType, Gl, GLU, Imaging, ImagingTypes, ImagingClasses,
ImagingOpenGL, OpenGLContext, ImagingUtility;
type

61
Server/cedserver.lpi
View File

@ -19,7 +19,7 @@
</VersionInfo>
<BuildModes Count="7">
<Item1 Name="default" Default="True"/>
<Item2 Name="Release Win32">
<Item2 Name="Release.Win32">
<CompilerOptions>
<Version Value="11"/>
<Target>
@ -55,15 +55,11 @@
<LinkSmart Value="True"/>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item2>
<Item3 Name="Release Linux x86">
<Item3 Name="Release.Linux.x86">
<CompilerOptions>
<Version Value="11"/>
<Target>
@ -99,15 +95,11 @@
<LinkSmart Value="True"/>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item3>
<Item4 Name="Release Linux x64">
<Item4 Name="Release.Linux.x64">
<CompilerOptions>
<Version Value="11"/>
<Target>
@ -142,15 +134,11 @@
<LinkSmart Value="True"/>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item4>
<Item5 Name="Debug Win32">
<Item5 Name="Debug.Win32">
<CompilerOptions>
<Version Value="11"/>
<Target>
@ -176,15 +164,11 @@
<TargetOS Value="win32"/>
</CodeGeneration>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item5>
<Item6 Name="Debug Linux x86">
<Item6 Name="Debug.Linux.x86">
<CompilerOptions>
<Version Value="11"/>
<Target>
@ -210,15 +194,11 @@
<TargetOS Value="linux"/>
</CodeGeneration>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item6>
<Item7 Name="Debug Linux x64">
<Item7 Name="Debug.Linux.x64">
<CompilerOptions>
<Version Value="11"/>
<Target>
@ -243,11 +223,7 @@
<TargetOS Value="linux"/>
</CodeGeneration>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CustomOptions Value="-dNoLogging"/>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</Item7>
@ -260,7 +236,6 @@
<RunParams>
<local>
<FormatVersion Value="1"/>
<LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
</local>
</RunParams>
<RequiredPackages Count="2">
@ -275,92 +250,74 @@
<Unit0>
<Filename Value="cedserver.lpr"/>
<IsPartOfProject Value="True"/>
<UnitName Value="cedserver"/>
</Unit0>
<Unit1>
<Filename Value="UConfig.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UConfig"/>
</Unit1>
<Unit2>
<Filename Value="UCEDServer.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UCEDServer"/>
</Unit2>
<Unit3>
<Filename Value="UNetState.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UNetState"/>
</Unit3>
<Unit4>
<Filename Value="UAccount.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UAccount"/>
</Unit4>
<Unit5>
<Filename Value="UConnectionHandling.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UConnectionHandling"/>
</Unit5>
<Unit6>
<Filename Value="URadarMap.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="URadarMap"/>
</Unit6>
<Unit7>
<Filename Value="ULargeScaleOperations.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ULargeScaleOperations"/>
</Unit7>
<Unit8>
<Filename Value="../UInterfaces.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UInterfaces"/>
</Unit8>
<Unit9>
<Filename Value="UPacketHandlers.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UPacketHandlers"/>
</Unit9>
<Unit10>
<Filename Value="ULandscape.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="ULandscape"/>
</Unit10>
<Unit11>
<Filename Value="UPackets.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UPackets"/>
</Unit11>
<Unit12>
<Filename Value="UAdminHandling.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UAdminHandling"/>
</Unit12>
<Unit13>
<Filename Value="UClientHandling.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UClientHandling"/>
</Unit13>
<Unit14>
<Filename Value="../UOLib/UStatics.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UStatics"/>
</Unit14>
<Unit15>
<Filename Value="../UOLib/UMap.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UMap"/>
</Unit15>
<Unit16>
<Filename Value="UMapManagement.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="UMapManagement"/>
</Unit16>
<Unit17>
<Filename Value="URegions.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="URegions"/>
</Unit17>
</Units>
</ProjectOptions>
@ -384,11 +341,5 @@
<DebugInfoType Value="dsDwarf2Set"/>
</Debugging>
</Linking>
<Other>
<CompilerMessages>
<UseMsgFile Value="True"/>
</CompilerMessages>
<CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
</CONFIG>