1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the MapEditor configuration so that it will compile a "release" version of the editor instead of the "debug" version that had been created. People should use this updated configuration to generate the Map Editor instead of messing with the defines in the builddefines.h file.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2008-06-25 15:33:58 +00:00
parent 631ba52d19
commit a2c73aab6d
13 changed files with 124 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Console/Console_2005Express.vcproj
+51 -20
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Console_2005Express" Name="Console_2005Express"
ProjectGUID="{F962CFA1-2215-4124-938F-253973A27591}" ProjectGUID="{F962CFA1-2215-4124-938F-253973A27591}"
RootNamespace="Console" RootNamespace="Console"
@@ -187,8 +187,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops;..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
UseOfMFC="0" UseOfMFC="0"
@@ -209,41 +209,39 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="true" MkTypLibCompatible="true"
SuppressStartupBanner="true" SuppressStartupBanner="true"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\Debug/Console.tlb" TypeLibraryName=".\Release/Console.tlb"
HeaderFileName="" HeaderFileName=""
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0" Optimization="2"
FavorSizeOrSpeed="0" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="&quot;c:\Program Files\Microsoft Platform SDK for Windows Server 2003 R2\src\mfc&quot;;..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" StringPooling="true"
BasicRuntimeChecks="3" RuntimeLibrary="0"
RuntimeLibrary="1" EnableFunctionLevelLinking="true"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\Debug/Console.pch" PrecompiledHeaderFile=".\Release/Console.pch"
AssemblerListingLocation=".\Debug/" AssemblerListingLocation=".\Release/"
ObjectFile=".\Debug/" ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Debug/" ProgramDataBaseFileName=".\Release/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="4"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
/> />
<Tool <Tool
Name="VCResourceCompilerTool" Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG" PreprocessorDefinitions="NDEBUG"
Culture="1050" Culture="1050"
/> />
<Tool <Tool
@@ -262,13 +260,14 @@
<Tool <Tool
Name="VCBscMakeTool" Name="VCBscMakeTool"
SuppressStartupBanner="true" SuppressStartupBanner="true"
OutputFile=".\Debug/Console.bsc" OutputFile=".\Release/Console.bsc"
/> />
<Tool <Tool
Name="VCFxCopTool" Name="VCFxCopTool"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine=""
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
@@ -299,6 +298,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="MapEditor|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="Cursors.cpp" RelativePath="Cursors.cpp"
@@ -320,6 +327,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="MapEditor|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="Dialogs.cpp" RelativePath="Dialogs.cpp"
@@ -341,6 +356,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="MapEditor|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="FileStream.cpp" RelativePath="FileStream.cpp"
@@ -362,6 +385,14 @@
PreprocessorDefinitions="" PreprocessorDefinitions=""
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="MapEditor|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
<Filter <Filter
Editor/Editor_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Editor_2005Express" Name="Editor_2005Express"
ProjectGUID="{60D793F2-90B4-43C9-83B5-221EE11B37E6}" ProjectGUID="{60D793F2-90B4-43C9-83B5-221EE11B37E6}"
RootNamespace="Editor_2005Express" RootNamespace="Editor_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
Laptop/Laptop_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Laptop_2005Express" Name="Laptop_2005Express"
ProjectGUID="{5234CD2E-97F1-42FF-828D-CE0A1B46805E}" ProjectGUID="{5234CD2E-97F1-42FF-828D-CE0A1B46805E}"
RootNamespace="Laptop_2005Express" RootNamespace="Laptop_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
Standard Gaming Platform/SGP_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="SGP_2005Express" Name="SGP_2005Express"
ProjectGUID="{6283CE93-2960-4596-8E74-7A6FBA8716FF}" ProjectGUID="{6283CE93-2960-4596-8E74-7A6FBA8716FF}"
RootNamespace="SGP_2005Express" RootNamespace="SGP_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NO_ZLIB_COMPRESSION" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;NO_ZLIB_COMPRESSION"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
Strategic/Strategic_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Strategic_2005Express" Name="Strategic_2005Express"
ProjectGUID="{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}" ProjectGUID="{AB8837DB-0435-40C7-916A-0AACF5CFF1C4}"
RootNamespace="Strategic_2005Express" RootNamespace="Strategic_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
Tactical/Tactical_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Tactical_2005Express" Name="Tactical_2005Express"
ProjectGUID="{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}" ProjectGUID="{D4BDA6AD-9B61-4953-892D-DA3F8CC7E096}"
RootNamespace="Tactical_2005Express" RootNamespace="Tactical_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
TacticalAI/TacticalAI_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="TacticalAI_2005Express" Name="TacticalAI_2005Express"
ProjectGUID="{27A49DAF-3F5A-4FF2-B943-9559F0B63032}" ProjectGUID="{27A49DAF-3F5A-4FF2-B943-9559F0B63032}"
RootNamespace="TacticalAI_2005Express" RootNamespace="TacticalAI_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
TileEngine/TileEngine_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="TileEngine_2005Express" Name="TileEngine_2005Express"
ProjectGUID="{FC1938E8-9253-49A8-AA99-4639BBB46C1B}" ProjectGUID="{FC1938E8-9253-49A8-AA99-4639BBB46C1B}"
RootNamespace="TileEngine_2005Express" RootNamespace="TileEngine_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
Utils/Utils_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="Utils_2005Express" Name="Utils_2005Express"
ProjectGUID="{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}" ProjectGUID="{262A5F80-0B99-4E8E-A6C7-74CB1FD0A67C}"
RootNamespace="Utils_2005Express" RootNamespace="Utils_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB" PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
builddefines.h
+2 -7
View File
@@ -3,14 +3,9 @@
#include "Language Defines.h" #include "Language Defines.h"
// ------------------------------------- // Map Editor version - you should use the MapEditor configuration instead of messing with these defines (ChrisL)
// Remove comment of the 2 defines to build a exe including the Map Editor! //#define JA2BETAVERSION
// Build the exe with "Release" and not "MapEditor".
// Then you have to make a shortcut of the EXE adding -EDITORAUTO as a starting parameter.
//#define JA2BETAVERSION
//#define JA2EDITOR //#define JA2EDITOR
// -------------------------------------
// Normal test version // Normal test version
//#define JA2TESTVERSION //#define JA2TESTVERSION
ja2_2005Express.vcproj
+16 -14
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="ja2_2005Express" Name="ja2_2005Express"
ProjectGUID="{F44669E7-74AC-444B-B75F-F16F4B9F0265}" ProjectGUID="{F44669E7-74AC-444B-B75F-F16F4B9F0265}"
RootNamespace="ja2_2005Express" RootNamespace="ja2_2005Express"
@@ -17,7 +17,7 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="C:\games\jagged alliance 2 EN" OutputDirectory="\games\jagged alliance 2"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressDebug.vsprops"
@@ -99,7 +99,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="C:\games\jagged alliance 2 en" OutputDirectory="\games\jagged alliance 2"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops"
@@ -183,12 +183,13 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="C:\games\jagged alliance 2 en" OutputDirectory="\games\jagged alliance 2"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops;.\ja2_2005ExpressEditor.vsprops"
UseOfMFC="0" UseOfMFC="0"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
@@ -208,17 +209,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet" AdditionalIncludeDirectories=".\;.\Utils;.\TileEngine;.\TacticalAI;.\Tactical;.\Strategic;&quot;.\Standard Gaming Platform&quot;;.\Res;.\lua;.\Laptop;.\Editor;.\Multiplayer;.\Multiplayer\raknet"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
@@ -231,11 +228,15 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStaticDebug.lib ws2_32.lib" AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
OutputFile="$(OutDir)\Map Editor_2222.exe" OutputFile="$(OutDir)\Map Editor_2227_en.exe"
LinkIncremental="2" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
GenerateMapFile="true"
MapFileName="$(TargetDir)$(TargetName).map"
SubSystem="2" SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
@@ -261,6 +262,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine=""
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>
ja2_2005ExpressEditor.vsprops
+1 -1
View File
@@ -6,6 +6,6 @@
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="JA2BETAVERSION;JA2TESTVERSION;DEBUG_ATTACKBUSY;JA2EDITOR" PreprocessorDefinitions="JA2BETAVERSION;JA2EDITOR"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
lua/lua_2005Express.vcproj
+6 -10
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8.00"
Name="lua_2005Express" Name="lua_2005Express"
ProjectGUID="{A83DA7DA-2C31-45D8-9A69-B4993A885E76}" ProjectGUID="{A83DA7DA-2C31-45D8-9A69-B4993A885E76}"
RootNamespace="lua_2005Express" RootNamespace="lua_2005Express"
@@ -143,8 +143,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="MapEditor|Win32" Name="MapEditor|Win32"
OutputDirectory="MapEditor" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="MapEditor" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops" InheritedPropertySheets="..\ja2_2005Express.vsprops;..\ja2_2005ExpressEditor.vsprops"
> >
@@ -166,17 +166,13 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;" AdditionalOptions="/D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
Optimization="0"
AdditionalIncludeDirectories="..\Multiplayer" AdditionalIncludeDirectories="..\Multiplayer"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;" PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
MinimalRebuild="true" RuntimeLibrary="0"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeTypeInfo="false" RuntimeTypeInfo="false"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
DebugInformationFormat="4" DebugInformationFormat="3"
DisableSpecificWarnings="4100"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"