Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- added g3d blender tools to vc++ project files and also to win32 installer (requires new win32 deps from sourceforge)

This commit is contained in:
Mark Vejvoda 2011-04-11 05:19:34 +00:00
parent 11f71421aa
commit ecdf1aecf3
6 changed files with 443 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mk/windoze/Glest.sln
View File

@ -28,6 +28,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glest_configurator", "glest
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.vcproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2g", "xml2g.vcproj", "{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@ -149,6 +153,42 @@ Global
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Release+MT with error catching|Win32.Build.0 = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Syncdebug|Win32.ActiveCfg = Release|Win32
{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}.Syncdebug|Win32.Build.0 = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Debug|Win32.ActiveCfg = Debug|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Debug|Win32.Build.0 = Debug|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Debug+MT|Win32.ActiveCfg = Debug|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Debug+MT|Win32.Build.0 = Debug|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Debug-MT|Win32.ActiveCfg = Debug|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Debug-MT|Win32.Build.0 = Debug|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.No debug|Win32.ActiveCfg = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.No debug|Win32.Build.0 = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release with error catching|Win32.ActiveCfg = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release with error catching|Win32.Build.0 = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release_NO_STREFLOP|Win32.ActiveCfg = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release_NO_STREFLOP|Win32.Build.0 = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release|Win32.ActiveCfg = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release|Win32.Build.0 = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Release+MT with error catching|Win32.Build.0 = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Syncdebug|Win32.ActiveCfg = Release|Win32
{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}.Syncdebug|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Debug|Win32.ActiveCfg = Debug|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Debug|Win32.Build.0 = Debug|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Debug+MT|Win32.ActiveCfg = Debug|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Debug+MT|Win32.Build.0 = Debug|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Debug-MT|Win32.ActiveCfg = Debug|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Debug-MT|Win32.Build.0 = Debug|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.No debug|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.No debug|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release with error catching|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release with error catching|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release_NO_STREFLOP|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release_NO_STREFLOP|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release+MT with error catching|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Release+MT with error catching|Win32.Build.0 = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Syncdebug|Win32.ActiveCfg = Release|Win32
{407355A4-D12A-4E3B-A7EB-A835E573B376}.Syncdebug|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

BIN
mk/windoze/Glest.suo
View File

Binary file not shown.

15
mk/windoze/Installer/MegaGlestInstaller.nsi
View File

@ -4,7 +4,7 @@
!define APNAME MegaGlest
!define APNAME_OLD Mega-Glest
!define APVER_OLD 3.4.0
!define APVER 3.5.0-beta1
!define APVER 3.5.0-beta2
Name "${APNAME} ${APVER}"
SetCompressor /FINAL /SOLID lzma
@ -163,6 +163,16 @@ Section "${APNAME} (required)"
# File "..\..\..\data\glest_game\dsound.dll"
File "..\..\..\data\glest_game\openal32.dll"
File "..\..\..\data\glest_game\xerces-c_3_0.dll"
SetOutPath "$INSTDIR\blender\"
File "..\..\..\data\glest_game\xml2g.exe"
File "..\..\..\data\glest_game\g2xml.exe"
File "..\..\..\source\tools\glexemel\g3d_support.py"
File "..\..\..\source\tools\glexemel\g3d_xml_exporter.py"
File "..\..\..\source\tools\glexemel\g3d.dtd"
File "..\..\..\source\tools\glexemel\g3d_logo.png"
SetOutPath $INSTDIR
File /r /x .svn /x mydata "..\..\..\data\glest_game\data"
File /r /x .svn /x mydata "..\..\..\data\glest_game\docs"
File /r /x .svn /x mydata "..\..\..\data\glest_game\maps"
@ -174,7 +184,7 @@ Section "${APNAME} (required)"
SetOutPath "$INSTDIR\data\core\misc_textures\"
File /r /x .svn /x mydata "..\..\..\source\masterserver\flags"
SetOutPath $INSTDIR
; Write the installation path into the registry
WriteRegStr HKLM Software\${APNAME} "Install_Dir" "$INSTDIR"
WriteRegStr HKLM Software\${APNAME} "Version" "${APVER}"
@ -194,6 +204,7 @@ Section "${APNAME} (required)"
CreateDirectory $INSTDIR\tilesets
CreateDirectory $INSTDIR\tutorials
CreateDirectory $INSTDIR\screens
CreateDirectory $INSTDIR\blender
AccessControl::GrantOnFile "$INSTDIR" "(BU)" "FullAccess"

2
mk/windoze/Installer/MegaGlestUpdater.nsi
View File

@ -5,7 +5,7 @@
!define APVER 3.5.0-beta
!define APNAME_OLD Mega-Glest
!define APVER_OLD 3.4.0
!define APVER_UPDATE 3.5.0-beta1
!define APVER_UPDATE 3.5.0-beta2
Name "${APNAME} ${APVER_UPDATE}"
SetCompressor /FINAL /SOLID lzma

193
mk/windoze/g2xml.vcproj Normal file
View File

@ -0,0 +1,193 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="g2xml"
ProjectGUID="{407355A4-D12A-4E3B-A7EB-A835E573B376}"
RootNamespace="g2xml"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\..\..\data\glest_game"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\source\tools\glexemel\g2xml.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

196
mk/windoze/xml2g.vcproj Normal file
View File

@ -0,0 +1,196 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="xml2g"
ProjectGUID="{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}"
RootNamespace="xml2g"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\..\..\data\glest_game"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;..\..\source\win32_deps\libxml2-2.7.7\include&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib libxml2_a.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;..\..\source\win32_deps\libxml2-2.7.7\win32\bin.msvc&quot;"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\source\tools\glexemel\xml2g.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>