Skip to content

Commit

Permalink
Added x64 build targets and disambiguated the build output directorie…
Browse files Browse the repository at this point in the history 
…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
@shaggie76
shaggie76 committed Dec 19, 2011
1 parent 1c64e1d commit 65be172
Show file tree
Hide file tree
Showing 3 changed files with 391 additions and 8 deletions.
10 changes: 10 additions & 0 deletions hlslang.sln
View file
Expand Up @@ -11,17 +11,27 @@ EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32 Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|Win32.ActiveCfg = Debug|Win32 {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|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.ActiveCfg = Release|Win32
{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.Build.0 = 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.ActiveCfg = Debug|Win32
{56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Debug|Win32.Build.0 = 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.ActiveCfg = Release|Win32
{56B380E1-EBFD-41DD-AE6C-A13B3B5AEE6B}.Release|Win32.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
Expand Down
225 changes: 221 additions & 4 deletions hlslang.vcproj
View file
Expand Up @@ -11,14 +11,17 @@
<Platform <Platform
Name="Win32" Name="Win32"
/> />
<Platform
Name="x64"
/>
</Platforms> </Platforms>
<ToolFiles> <ToolFiles>
</ToolFiles> </ToolFiles>
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="lib/win32/$(ConfigurationName)" OutputDirectory="lib/win32/$(ConfigurationName)"
IntermediateDirectory="build/$(ConfigurationName)" IntermediateDirectory="build/$(PlatformName)/$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
Expand Down Expand Up @@ -49,7 +52,7 @@
ExceptionHandling="0" ExceptionHandling="0"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile="" PrecompiledHeaderFile=""
ProgramDataBaseFileName="$(IntDir)\hlsl2glsl.pdb" ProgramDataBaseFileName="$(OutDir)\hlsl2glsl.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
Expand Down Expand Up @@ -91,7 +94,160 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="lib/win32/$(ConfigurationName)" 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" ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0" UseOfMFC="0"
Expand All @@ -112,6 +268,7 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Expand All @@ -128,7 +285,7 @@
BufferSecurityCheck="true" BufferSecurityCheck="true"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
PrecompiledHeaderFile="" PrecompiledHeaderFile=""
ProgramDataBaseFileName="$(IntDir)\hlsl2glsl.pdb" ProgramDataBaseFileName="$(OutDir)\hlsl2glsl.pdb"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
DebugInformationFormat="3" DebugInformationFormat="3"
Expand Down Expand Up @@ -204,6 +361,28 @@
Outputs="$(InputDir)Gen_hlslang.cpp" Outputs="$(InputDir)Gen_hlslang.cpp"
/> />
</FileConfiguration> </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>
<File <File
RelativePath="hlslang\MachineIndependent\hlslang.y" RelativePath="hlslang\MachineIndependent\hlslang.y"
Expand All @@ -228,6 +407,26 @@
Outputs="$(InputDir)Gen_$(InputName)_tab.cpp" Outputs="$(InputDir)Gen_$(InputName)_tab.cpp"
/> />
</FileConfiguration> </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>
<File <File
RelativePath="hlslang\MachineIndependent\InfoSink.cpp" RelativePath="hlslang\MachineIndependent\InfoSink.cpp"
Expand Down Expand Up @@ -569,6 +768,24 @@
ObjectFile="$(IntDir)/$(InputName)1.obj" ObjectFile="$(IntDir)/$(InputName)1.obj"
/> />
</FileConfiguration> </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> </File>
</Filter> </Filter>
</Filter> </Filter>
Expand Down

0 comments on commit 65be172

Please sign in to comment.