diff options
| author | Tim Foley <tfoley@nvidia.com> | 2017-07-19 11:27:23 -0700 |
|---|---|---|
| committer | Tim Foley <tfoley@nvidia.com> | 2017-07-19 11:27:23 -0700 |
| commit | a97eac202cec673a0f2e27e808cfdcdd29289c4e (patch) | |
| tree | 71022a3689bedfffe0ee3d969daffb2ae42fc720 /tools/glslang/glslang.vcxproj | |
| parent | c5ed9e8d6bc1668d6075b42b17d65a97c168c98b (diff) | |
Build a dynamic library for Slang
- Change the `slang` project from a static library to a dynamic one
- Add some details around `slang.h` to make sure DLL export stuff is working
- Make the `slangc` executable use the dynamic library
- Rename the `glslang` sub-project to `slang-glslang` and move it into the main source hierarchy
- This reflects the fact that it isn't a stand-alone tool, and isn't in any way a standard binary of glslang, but rather just an artifact of how Slang uses glslang
Diffstat (limited to 'tools/glslang/glslang.vcxproj')
| -rw-r--r-- | tools/glslang/glslang.vcxproj | 235 |
1 files changed, 0 insertions, 235 deletions
diff --git a/tools/glslang/glslang.vcxproj b/tools/glslang/glslang.vcxproj deleted file mode 100644 index 2d24e513a..000000000 --- a/tools/glslang/glslang.vcxproj +++ /dev/null @@ -1,235 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{C495878A-832C-485B-B347-0998A90CC936}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>glslang</RootNamespace> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\..\build\slang-build.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <IncludePath>$(SolutionDir)external\glslang\;$(IncludePath)</IncludePath> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;GLSLANG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\CodeGen.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\GenericCodeGen\Link.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Constant.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\InfoSink.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Intermediate.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\intermOut.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\IntermTraverse.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\limits.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\linkValidate.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\parseConst.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseContextBase.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\PoolAlloc.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\reflection.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Scan.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\ShaderLang.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\MachineIndependent\Versions.cpp" /> - <ClCompile Include="..\..\external\glslang\glslang\OSDependent\Windows\ossource.cpp" /> - <ClCompile Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\disassemble.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\doc.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\GlslangToSpv.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\InReadableOrder.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\Logger.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\SpvBuilder.cpp" /> - <ClCompile Include="..\..\external\glslang\SPIRV\SPVRemapper.cpp" /> - <ClCompile Include="..\..\external\glslang\StandAlone\ResourceLimits.cpp" /> - <ClCompile Include="..\..\external\glslang\StandAlone\StandAlone.cpp" /> - <ClCompile Include="glslang.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\glslang_tab.cpp.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\gl_types.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Initialize.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\iomapper.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\LiveTraverser.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\localintermediate.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ParseHelper.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\parseVersions.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpContext.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\preprocessor\PpTokens.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\propagateNoContraction.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\reflection.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\RemoveTree.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Scan.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\ScanContext.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\SymbolTable.h" /> - <ClInclude Include="..\..\external\glslang\glslang\MachineIndependent\Versions.h" /> - <ClInclude Include="..\..\external\glslang\glslang\OSDependent\osinclude.h" /> - <ClInclude Include="..\..\external\glslang\OGLCompilersDLL\InitializeDll.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\bitutils.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\disassemble.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\doc.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.AMD.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.KHR.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.ext.NV.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GLSL.std.450.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\GlslangToSpv.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\hex_float.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\Logger.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\spirv.hpp" /> - <ClInclude Include="..\..\external\glslang\SPIRV\SpvBuilder.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\spvIR.h" /> - <ClInclude Include="..\..\external\glslang\SPIRV\SPVRemapper.h" /> - <ClInclude Include="..\..\external\glslang\StandAlone\ResourceLimits.h" /> - <ClInclude Include="..\..\external\glslang\StandAlone\Worklist.h" /> - <ClInclude Include="glslang.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file |
