Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added x64 build targets and disambiguated the build output directorie…

…s for each.

Also redirected PDB output to be beside the libs (since you'd want to distribute it with the lib).
  • Loading branch information...
commit 65be1725e78082a9f82c37b7024387404d852b08 1 parent 1c64e1d
Glen Miner shaggie76 authored
Showing with 391 additions and 8 deletions.
  1. +10 −0 hlslang.sln
  2. +221 −4 hlslang.vcproj
  3. +160 −4 tests/hlsl2glsltest/hlsl2glsltest.vcproj
10 hlslang.sln
View
@@ -11,17 +11,27 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|Win32.ActiveCfg = Debug|Win32
{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|Win32.Build.0 = Debug|Win32
+ {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|x64.ActiveCfg = Debug|x64
+ {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|x64.Build.0 = Debug|x64
{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.ActiveCfg = Release|Win32
{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.Build.0 = Release|Win32
+ {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|x64.ActiveCfg = Release|x64
+ {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|x64.Build.0 = Release|x64
{56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Debug|Win32.ActiveCfg = Debug|Win32
{56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Debug|Win32.Build.0 = Debug|Win32
+ {56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Debug|x64.ActiveCfg = Debug|x64
+ {56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Debug|x64.Build.0 = Debug|x64
{56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Release|Win32.ActiveCfg = Release|Win32
{56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Release|Win32.Build.0 = Release|Win32
+ {56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Release|x64.ActiveCfg = Release|x64
+ {56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
225 hlslang.vcproj
View
@@ -11,6 +11,9 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -18,7 +21,7 @@
<Configuration
Name="Debug|Win32"
OutputDirectory="lib/win32/$(ConfigurationName)"
- IntermediateDirectory="build/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -49,7 +52,7 @@
ExceptionHandling="0"
RuntimeLibrary="1"
PrecompiledHeaderFile=""
- ProgramDataBaseFileName="$(IntDir)\hlsl2glsl.pdb"
+ ProgramDataBaseFileName="$(OutDir)\hlsl2glsl.pdb"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -91,7 +94,160 @@
<Configuration
Name="Release|Win32"
OutputDirectory="lib/win32/$(ConfigurationName)"
- IntermediateDirectory="build/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="1"
+ InlineFunctionExpansion="2"
+ OmitFramePointers="true"
+ AdditionalIncludeDirectories="hlslang;hlslang\MachineIndependent;hlslang\OSDependent\Windows;OGLCompilersDLL"
+ PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;_LIB;GENERIC_COMPILER;_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;_SECURE_SCL=0"
+ StringPooling="true"
+ ExceptionHandling="0"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="0"
+ BufferSecurityCheck="true"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=""
+ ProgramDataBaseFileName="$(OutDir)\hlsl2glsl.pdb"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CallingConvention="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="2057"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\hlsl2glsl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="lib/win64/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/MP"
+ Optimization="0"
+ AdditionalIncludeDirectories="hlslang;hlslang\MachineIndependent;hlslang\OSDependent\Windows;OGLCompilersDLL"
+ PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_LIB;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;_SECURE_SCL=0"
+ ExceptionHandling="0"
+ RuntimeLibrary="1"
+ PrecompiledHeaderFile=""
+ ProgramDataBaseFileName="$(OutDir)\hlsl2glsl.pdb"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ DebugInformationFormat="3"
+ CallingConvention="1"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="2057"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\hlsl2glsl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine=""
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="lib/win64/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -112,6 +268,7 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -128,7 +285,7 @@
BufferSecurityCheck="true"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=""
- ProgramDataBaseFileName="$(IntDir)\hlsl2glsl.pdb"
+ ProgramDataBaseFileName="$(OutDir)\hlsl2glsl.pdb"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
@@ -204,6 +361,28 @@
Outputs="$(InputDir)Gen_hlslang.cpp"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Executing flex on $(InputPath)"
+ CommandLine="$(InputDir)..\..\tools\flex.exe $(InputPath)&#x0D;&#x0A;if EXIST $(InputDir)gen_hlslang.cpp del $(InputDir)gen_hlslang.cpp&#x0D;&#x0A;move gen_hlslang.cpp $(InputDir)gen_hlslang.cpp&#x0D;&#x0A;cd $(InputDir)&#x0D;&#x0A;rename gen_hlslang.cpp Gen_hlslang.cpp&#x0D;&#x0A;"
+ AdditionalDependencies="hlslang_tab.h"
+ Outputs="$(InputDir)Gen_hlslang.cpp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Executing flex on $(InputPath)"
+ CommandLine="$(InputDir)..\..\tools\flex.exe $(InputPath)&#x0D;&#x0A;if EXIST $(InputDir)gen_hlslang.cpp del $(InputDir)gen_hlslang.cpp&#x0D;&#x0A;move gen_hlslang.cpp $(InputDir)gen_hlslang.cpp&#x0D;&#x0A;"
+ AdditionalDependencies="hlslang_tab.h"
+ Outputs="$(InputDir)Gen_hlslang.cpp"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="hlslang\MachineIndependent\hlslang.y"
@@ -228,6 +407,26 @@
Outputs="$(InputDir)Gen_$(InputName)_tab.cpp"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Executing Bison on $(InputPath)"
+ CommandLine="SET BISON_SIMPLE=$(InputDir)..\..\tools\bison.simple&#x0D;&#x0A;SET BISON_HAIRY=$(InputDir)..\..\tools\bison.simple&#x0D;&#x0A;cd $(InputDir)&#x0D;&#x0A;$(InputDir)..\..\tools\bison.exe -d -t -v $(InputName).y&#x0D;&#x0A;if EXIST $(InputDir)Gen_$(InputName)_tab.cpp del $(InputDir)Gen_$(InputName)_tab.cpp&#x0D;&#x0A;rename $(InputDir)$(InputName)_tab.c Gen_$(InputName)_tab.cpp&#x0D;&#x0A;"
+ Outputs="$(InputDir)Gen_$(InputName)_tab.cpp"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ Description="Executing Bison on $(InputPath)"
+ CommandLine="SET BISON_SIMPLE=$(InputDir)..\..\tools\bison.simple&#x0D;&#x0A;SET BISON_HAIRY=$(InputDir)..\..\tools\bison.simple&#x0D;&#x0A;cd $(InputDir)&#x0D;&#x0A;$(InputDir)..\..\tools\bison.exe -d -t -v $(InputName).y&#x0D;&#x0A;if EXIST $(InputDir)Gen_$(InputName)_tab.cpp del $(InputDir)Gen_$(InputName)_tab.cpp&#x0D;&#x0A;rename $(InputDir)$(InputName)_tab.c Gen_$(InputName)_tab.cpp&#x0D;&#x0A;"
+ Outputs="$(InputDir)Gen_$(InputName)_tab.cpp"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="hlslang\MachineIndependent\InfoSink.cpp"
@@ -569,6 +768,24 @@
ObjectFile="$(IntDir)/$(InputName)1.obj"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)/$(InputName)1.obj"
+ />
+ </FileConfiguration>
</File>
</Filter>
</Filter>
164 tests/hlsl2glsltest/hlsl2glsltest.vcproj
View
@@ -12,14 +12,17 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
- OutputDirectory="build/$(ConfigurationName)"
- IntermediateDirectory="build/$(ConfigurationName)"
+ OutputDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
@@ -92,8 +95,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
- OutputDirectory="build/$(ConfigurationName)"
- IntermediateDirectory="build/$(ConfigurationName)"
+ OutputDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
@@ -167,6 +170,159 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug|x64"
+ OutputDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;_SECURE_SCL=0"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="opengl32.lib"
+ LinkIncremental="2"
+ GenerateManifest="false"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ EmbedManifest="false"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_CRT_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=0;_SECURE_SCL=0"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="opengl32.lib"
+ LinkIncremental="1"
+ GenerateManifest="false"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ EmbedManifest="false"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
Please sign in to comment.
Something went wrong with that request. Please try again.