commit ece0d0ca277fed6184318155378b430c74e72a0e
author John Kessenich <cepheus@frii.com> Thu Dec 13 00:09:49 2012 +0000
committer John Kessenich <cepheus@frii.com> Thu Dec 13 00:09:49 2012 +0000
tree a236519cbb11646e6b8c1786b8527074009cf881
parent 9fd55bd3385e850dd3593bdc4466f092f7ac9bf6

Change the core of glslang to be a static library rather than a DLL.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@19952 e7fa87d3-cd2b-0410-9028-fcbf551c1848

glslang.vcxproj

diff --git a/glslang.vcxproj b/glslang.vcxproj
index 555ddf1..60d5aa6 100644
--- a/glslang.vcxproj
+++ b/glslang.vcxproj
@@ -16,13 +16,12 @@
   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

+    <ConfigurationType>StaticLibrary</ConfigurationType>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

@@ -40,18 +39,21 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glslang\UserM_Debug\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">glslang\UserM_Debug\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UserM_Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">UserM_Release\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">glslang\UserM_Release\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">glslang\UserM_Release\</IntDir>

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</PostBuildEventUseInBuild>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.lib</TargetExt>

+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.lib</TargetExt>

+    <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>false</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeaderOutputFile>

       </PrecompiledHeaderOutputFile>

       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>

@@ -62,8 +64,10 @@
       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CallingConvention>FastCall</CallingConvention>

+      <CallingConvention>Cdecl</CallingConvention>

       <CompileAs>Default</CompileAs>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <StringPooling>true</StringPooling>

     </ClCompile>

     <Link>

       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>

@@ -106,13 +110,14 @@
       </PrecompiledHeaderOutputFile>

       <AssemblerListingLocation>UserM_Release/</AssemblerListingLocation>

       <ObjectFileName>UserM_Release/</ObjectFileName>

-      <ProgramDataBaseFileName>UserM_Release/glslang</ProgramDataBaseFileName>

+      <ProgramDataBaseFileName>

+      </ProgramDataBaseFileName>

       <BrowseInformation>

       </BrowseInformation>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <CallingConvention>FastCall</CallingConvention>

+      <CallingConvention>Cdecl</CallingConvention>

       <CompileAs>Default</CompileAs>

     </ClCompile>

     <Link>

@@ -133,7 +138,8 @@
     </Midl>

     <PostBuildEvent>

       <Message>copy dll</Message>

-      <Command>xcopy /y UserM_Release\generic\glslang.* StandAlone</Command>

+      <Command>del Test\$(TargetName)$(TargetExt)

+xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test</Command>

     </PostBuildEvent>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -164,8 +170,6 @@
     <ClCompile Include="glslang\MachineIndependent\preprocessor\scanner.c" />

     <ClCompile Include="glslang\MachineIndependent\preprocessor\symbols.c" />

     <ClCompile Include="glslang\MachineIndependent\preprocessor\tokens.c" />

-    <ClCompile Include="glslang\GenericCodeGen\CodeGen.cpp" />

-    <ClCompile Include="glslang\GenericCodeGen\Link.cpp" />

     <ClCompile Include="glslang\OSDependent\Windows\main.cpp" />

     <ClCompile Include="glslang\OSDependent\Windows\ossource.cpp" />

     <ClCompile Include="glslang\OSDependent\Linux\ossource.cpp">