diff --git a/.gitignore b/.gitignore index d93c2022..153aa048 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ *.so *.exe tags +glslang/MachineIndependent/glslang_tab.cpp +glslang/MachineIndependent/glslang_tab.cpp.h build/ Test/localResults/ Test/multiThread.out diff --git a/CMakeLists.txt b/CMakeLists.txt index ef8bf358..ee484e23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,10 @@ project(glslang) if(WIN32) set(CMAKE_GENERATOR_TOOLSET "v110" CACHE STRING "Platform Toolset" FORCE) include(ChooseMSVCCRT.cmake) + add_definitions(-DGLSLANG_OSINCLUDE_WIN32) elseif(UNIX) add_definitions(-fPIC) + add_definitions(-DGLSLANG_OSINCLUDE_UNIX) else(WIN32) message("unkown platform") endif(WIN32) diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt index afabe75b..60fb93b6 100644 --- a/OGLCompilersDLL/CMakeLists.txt +++ b/OGLCompilersDLL/CMakeLists.txt @@ -1,14 +1,5 @@ cmake_minimum_required(VERSION 2.8) -include_directories(. ../glslang) -if(WIN32) - include_directories(${include_directories} ../glslang/OSDependent/Windows) -elseif(UNIX) - include_directories(${include_directories} ../glslang/OSDependent/Linux) -else(WIN32) - message("unknown platform") -endif(WIN32) - set(SOURCES InitializeDll.cpp InitializeDll.h) add_library(OGLCompiler STATIC ${SOURCES}) diff --git a/OGLCompilersDLL/InitializeDll.h b/OGLCompilersDLL/InitializeDll.h index 8a296793..2d245574 100644 --- a/OGLCompilersDLL/InitializeDll.h +++ b/OGLCompilersDLL/InitializeDll.h @@ -35,7 +35,7 @@ #define __INITIALIZEDLL_H -#include "osinclude.h" +#include "../glslang/OSDependent/osinclude.h" namespace glslang { diff --git a/OGLCompilersDLL/Makefile b/OGLCompilersDLL/Makefile deleted file mode 100644 index f7885478..00000000 --- a/OGLCompilersDLL/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -INCLUDE = -I. -I../glslang -I../glslang/Include -I../glslang/OSDependent/Linux -I../glslang/MachineIndependent -WARNINGS = -Wall -Wwrite-strings -Wpointer-arith -Wcast-align -Wstrict-prototypes \ - -Wnested-externs - -CPP = g++ -CPPOPTIONS = -O3 -Wno-deprecated -D_ALT_NS=1 -fPIC -CPPOPTIONS = -g -Wno-deprecated -D_ALT_NS=1 -fPIC -CPPFLAGS = $(CPPOPTIONS) $(INCLUDE) - -# -# Linking related -# -AR = ar -STATIC_OPTION = rcs - -# -# Misc -# -export PERL = perl -export RM = rm -f -export MV = mv -f -export DEPEND = g++ -M - -# -# Object file variables are defined here. -# -OSSRCS = InitializeDll.cpp -OSOBJS = InitializeDll.o - -LIBNAME = libInitializeDll.a - -all : $(LIBNAME) - -$(LIBNAME) : $(OSOBJS) - $(AR) $(STATIC_OPTION) $(LIBNAME) $(OSOBJS) - -%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< - -# -# Dependency -# -depend : $(OSSRCS) - $(DEPEND) $(CPPFLAGS) $(OSSRCS) > depend -include depend - -# -# Cleanup -# -.PHONY : clean -clean : - $(RM) *.o *.a diff --git a/README.md b/README.md index 59dafa83..f56817c7 100644 --- a/README.md +++ b/README.md @@ -47,10 +47,6 @@ CMake: The currently maintained and preferred way of building is through CMake. In MSVC, after running CMake, you may need to use the Configuration Manager to check the INSTALL project. -Note there are some legacy build methods still intermingled within the directory -structure (make, MSVC), but these are no longer maintained, having been -replaced with CMake. - Programmatic Interfaces ----------------------- diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt index a255aca9..945350e7 100755 --- a/SPIRV/CMakeLists.txt +++ b/SPIRV/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 2.8) -include_directories(.. ${CMAKE_CURRENT_BINARY_DIR}) - set(SOURCES GlslangToSpv.cpp SpvBuilder.cpp diff --git a/SPIRV/disassemble.cpp b/SPIRV/disassemble.cpp index 8662f036..08f905ef 100755 --- a/SPIRV/disassemble.cpp +++ b/SPIRV/disassemble.cpp @@ -50,7 +50,7 @@ namespace spv { // Include C-based headers that don't have a namespace - #include "SPIRV/GLSL.std.450.h" + #include "GLSL.std.450.h" } const char* GlslStd450DebugNames[spv::GLSLstd450Count]; diff --git a/StandAlone.sln b/StandAlone.sln deleted file mode 100644 index ab7ac68e..00000000 --- a/StandAlone.sln +++ /dev/null @@ -1,55 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StandAlone", "StandAlone.vcxproj", "{660D0A05-69A9-4F09-9664-02FBEB08FAE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "glslang.vcxproj", "{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug CRT DLL|Win32 = Debug CRT DLL|Win32 - Debug CRT DLL|x64 = Debug CRT DLL|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release CRT DLL|Win32 = Release CRT DLL|Win32 - Release CRT DLL|x64 = Release CRT DLL|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug CRT DLL|Win32.ActiveCfg = Debug CRT DLL|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug CRT DLL|Win32.Build.0 = Debug CRT DLL|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug CRT DLL|x64.ActiveCfg = Debug CRT DLL|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug CRT DLL|x64.Build.0 = Debug CRT DLL|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.Build.0 = Debug|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.ActiveCfg = Debug|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.Build.0 = Debug|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release CRT DLL|Win32.ActiveCfg = Release CRT DLL|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release CRT DLL|Win32.Build.0 = Release CRT DLL|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release CRT DLL|x64.ActiveCfg = Release CRT DLL|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release CRT DLL|x64.Build.0 = Release CRT DLL|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.ActiveCfg = Release|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.Build.0 = Release|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.ActiveCfg = Release|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.Build.0 = Release|x64 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug CRT DLL|Win32.ActiveCfg = Debug CRT DLL|Win32 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug CRT DLL|Win32.Build.0 = Debug CRT DLL|Win32 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug CRT DLL|x64.ActiveCfg = Debug CRT DLL|x64 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug CRT DLL|x64.Build.0 = Debug CRT DLL|x64 - {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 CRT DLL|Win32.ActiveCfg = Release CRT DLL|Win32 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release CRT DLL|Win32.Build.0 = Release CRT DLL|Win32 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release CRT DLL|x64.ActiveCfg = Release CRT DLL|x64 - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release CRT DLL|x64.Build.0 = Release CRT DLL|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 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/StandAlone.vcxproj b/StandAlone.vcxproj deleted file mode 100644 index f8d1210e..00000000 --- a/StandAlone.vcxproj +++ /dev/null @@ -1,550 +0,0 @@ - - - - - Debug CRT DLL - Win32 - - - Debug CRT DLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release CRT DLL - Win32 - - - Release CRT DLL - x64 - - - Release - Win32 - - - Release - x64 - - - - StandAlone - {660D0A05-69A9-4F09-9664-02FBEB08FAE2} - - - - Application - false - MultiByte - v110_xp - - - Application - false - MultiByte - v110_xp - - - Application - false - MultiByte - v110_xp - - - Application - false - MultiByte - v110_xp - - - Application - MultiByte - v110_xp - - - Application - MultiByte - v110_xp - - - Application - MultiByte - v110_xp - - - Application - MultiByte - v110_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug\ - true - true - true - true - StandAlone\UserM_Release\ - StandAlone\UserM_Release\ - StandAlone\UserM_Release\ - StandAlone\UserM_Release\ - false - false - false - false - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebug - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;glslang\UserM_Debug\glslang.lib;%(AdditionalDependencies) - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Debug\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebug - - - odbc32.lib;odbccp32.lib;psapi.lib;$(OutDir)glslang.lib - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y x64\Debug\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebugDLL - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;glslang\UserM_Debug\glslang.lib;%(AdditionalDependencies) - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Debug\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebugDLL - - - odbc32.lib;odbccp32.lib;psapi.lib;$(OutDir)glslang.lib - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y x64\Debug\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - Default - MultiThreaded - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;glslang\UserM_Release\glslang.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Release\glslangValidator.exe Test -xcopy /y StandAlone\UserM_Release\glslangValidator.exe Install\Windows - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - Default - MultiThreaded - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - odbc32.lib;odbccp32.lib;psapi.lib;$(OutDir)glslang.lib - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y x64\Release\glslangValidator.exe Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - Default - MultiThreadedDLL - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;glslang\UserM_Release\glslang.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Release\glslangValidator.exe Test -xcopy /y StandAlone\UserM_Release\glslangValidator.exe Install\Windows - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - Default - MultiThreadedDLL - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - odbc32.lib;odbccp32.lib;psapi.lib;$(OutDir)glslang.lib - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y x64\Release\glslangValidator.exe Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - - {3b146cc5-b2b8-4573-9d46-6139e2edfea3} - false - - - - - - - - - \ No newline at end of file diff --git a/StandAlone.vcxproj.filters b/StandAlone.vcxproj.filters deleted file mode 100644 index 05d04bba..00000000 --- a/StandAlone.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {fcd4a310-b19f-40bd-9324-e7d4e7d4dad1} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - \ No newline at end of file diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index bc35c08d..38cb2bdb 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -1,14 +1,5 @@ cmake_minimum_required(VERSION 2.8) -include_directories(.) -if(WIN32) - include_directories(../glslang/OSDependent/Windows) -elseif(UNIX) - include_directories(../glslang/OSDependent/Linux) -else(WIN32) - message("unkown platform") -endif(WIN32) - set(SOURCES StandAlone.cpp) set(REMAPPER_SOURCES spirv-remap.cpp) diff --git a/StandAlone/Makefile b/StandAlone/Makefile deleted file mode 100644 index 9301498f..00000000 --- a/StandAlone/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -SRCS := StandAlone.cpp -OBJECTS := $(SRCS:.cpp=.o) -DEPS := $(addprefix ., $(SRCS:.cpp=.d)) - -OBJECTPATH=./../glslang/MachineIndependent -LIBPATH=./../glslang/MachineIndependent/lib -SRCS=StandAlone.cpp - -CXXFLAGS += -fPIC -I../glslang/OSDependent/Linux - -all: glslangValidator - -glslangValidator: $(OBJECTS) regenlib - $(CC) -g -o $@ $(OBJECTS) -L $(LIBPATH) -lglslang -lpthread -lm -lstdc++ - cp $@ ../Test - cp $@ ../Install/Linux - --include $(DEPS) - -%.o : %.cpp - $(CXX) $(CXXFLAGS) -MMD -MP -MF $(addprefix ., $(<:.cpp=.d)) -c -o $@ $< - -regenlib: - $(MAKE) -C $(OBJECTPATH) - -# -# Cleanup -# -.PHONY : clean glslangValidator regenlib -clean : - $(RM) *.o glslangValidator ../Install/Linux/glslangValidator - $(MAKE) -C $(OBJECTPATH) clean diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index 59bcb238..0277ef29 100755 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -49,7 +49,7 @@ #include #include -#include "osinclude.h" +#include "../glslang/OSDependent/osinclude.h" extern "C" { SH_IMPORT_EXPORT void ShOutputHtml(); diff --git a/StandAlone/Worklist.h b/StandAlone/Worklist.h index c3040076..57dc0db7 100644 --- a/StandAlone/Worklist.h +++ b/StandAlone/Worklist.h @@ -35,7 +35,7 @@ #ifndef WORKLIST_H_INCLUDED #define WORKLIST_H_INCLUDED -#include "osinclude.h" +#include "../glslang/OSDependent/osinclude.h" #include #include diff --git a/StandAlone_vs2010.sln b/StandAlone_vs2010.sln deleted file mode 100644 index f71755fc..00000000 --- a/StandAlone_vs2010.sln +++ /dev/null @@ -1,38 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "glslang_vs2010.vcxproj", "{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StandAlone", "StandAlone_vs2010.vcxproj", "{660D0A05-69A9-4F09-9664-02FBEB08FAE2}" - ProjectSection(ProjectDependencies) = postProject - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3} = {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3} - EndProjectSection -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 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.Build.0 = Debug|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.ActiveCfg = Debug|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.Build.0 = Debug|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.ActiveCfg = Release|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.Build.0 = Release|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.ActiveCfg = Release|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/StandAlone_vs2010.vcxproj b/StandAlone_vs2010.vcxproj deleted file mode 100644 index 132ddb9e..00000000 --- a/StandAlone_vs2010.vcxproj +++ /dev/null @@ -1,292 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StandAlone - {660D0A05-69A9-4F09-9664-02FBEB08FAE2} - - - - Application - false - MultiByte - v100 - - - Application - false - MultiByte - v100 - - - Application - MultiByte - v100 - - - Application - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug64\ - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug64\ - true - true - StandAlone\UserM_Release\ - StandAlone\UserM_Release64\ - StandAlone\UserM_Release\ - StandAlone\UserM_Release64\ - false - false - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebug - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;lib\x86\Debug\glslang.lib;%(AdditionalDependencies) - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Debug\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebug - - - odbc32.lib;odbccp32.lib;psapi.lib;lib\x64\Debug\glslang.lib;%(AdditionalDependencies) - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Debug64\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - Default - MultiThreaded - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;lib\x86\Release\glslang.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Release\glslangValidator.exe Test -xcopy /y StandAlone\UserM_Release\glslangValidator.exe Install\Windows - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - Default - MultiThreaded - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - odbc32.lib;odbccp32.lib;psapi.lib;lib\x64\Release\glslang.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Release64\glslangValidator.exe Test -xcopy /y StandAlone\UserM_Release64\glslangValidator.exe Install\Windows - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/StandAlone_vs2013.sln b/StandAlone_vs2013.sln deleted file mode 100644 index de6bc615..00000000 --- a/StandAlone_vs2013.sln +++ /dev/null @@ -1,37 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "glslang_vs2013.vcxproj", "{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StandAlone", "StandAlone_vs2013.vcxproj", "{660D0A05-69A9-4F09-9664-02FBEB08FAE2}" -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 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.Build.0 = Debug|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.ActiveCfg = Debug|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.Build.0 = Debug|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.ActiveCfg = Release|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.Build.0 = Release|Win32 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.ActiveCfg = Release|x64 - {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/StandAlone_vs2013.vcxproj b/StandAlone_vs2013.vcxproj deleted file mode 100644 index 350cd85a..00000000 --- a/StandAlone_vs2013.vcxproj +++ /dev/null @@ -1,292 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - StandAlone - {660D0A05-69A9-4F09-9664-02FBEB08FAE2} - - - - Application - false - MultiByte - v120_xp - - - Application - false - MultiByte - v120_xp - - - Application - MultiByte - v120_xp - - - Application - MultiByte - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug64\ - StandAlone\UserM_Debug\ - StandAlone\UserM_Debug64\ - true - true - StandAlone\UserM_Release\ - StandAlone\UserM_Release64\ - StandAlone\UserM_Release\ - StandAlone\UserM_Release64\ - false - false - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - glslangValidator - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebug - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;lib\x86\Debug\glslang.lib;%(AdditionalDependencies) - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Debug\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - Disabled - glslang;glslang\OSDependent\Windows - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - EnableFastChecks - - - - - $(IntDir) - $(IntDir) - $(IntDir) - Level3 - true - ProgramDatabase - Cdecl - MultiThreadedDebug - - - odbc32.lib;odbccp32.lib;psapi.lib;lib\x64\Debug\glslang.lib;%(AdditionalDependencies) - true - true - UserM_Debug/StandAlone.pdb - Console - $(OutDir)$(TargetName)$(TargetExt) - MachineX64 - - - UserM_Debug/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Debug64\glslangValidator.exe Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - Default - MultiThreaded - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;psapi.lib;lib\x86\Release\glslang.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Release\glslangValidator.exe Test -xcopy /y StandAlone\UserM_Release\glslangValidator.exe Install\Windows - - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\OSDependent\Windows - WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) - true - Default - MultiThreaded - true - true - - - - - UserM_Release/ - UserM_Release/ - - - Level3 - true - ProgramDatabase - Cdecl - - - odbc32.lib;odbccp32.lib;psapi.lib;lib\x64\Release\glslang.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) - true - - - true - UserM_Release/StandAlone.pdb - Console - true - true - - - UserM_Release/StandAlone.tlb - - - copy glslangValidator - xcopy /y StandAlone\UserM_Release64\glslangValidator.exe Test -xcopy /y StandAlone\UserM_Release64\glslangValidator.exe Install\Windows - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - - - - - - - - - \ No newline at end of file diff --git a/glslang.vcxproj b/glslang.vcxproj deleted file mode 100644 index 59d33279..00000000 --- a/glslang.vcxproj +++ /dev/null @@ -1,706 +0,0 @@ - - - - - Debug CRT DLL - Win32 - - - Debug CRT DLL - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release CRT DLL - Win32 - - - Release CRT DLL - x64 - - - Release - Win32 - - - Release - x64 - - - - glslang - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3} - - - - StaticLibrary - false - MultiByte - v110_xp - - - StaticLibrary - false - MultiByte - v110_xp - - - StaticLibrary - false - MultiByte - v110_xp - - - StaticLibrary - false - MultiByte - v110_xp - - - StaticLibrary - MultiByte - v110_xp - - - StaticLibrary - MultiByte - v110_xp - - - StaticLibrary - MultiByte - v110_xp - - - StaticLibrary - MultiByte - v110_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - glslang\UserM_Debug\ - glslang\UserM_Debug\ - glslang\UserM_Debug\ - glslang\UserM_Debug\ - false - false - false - false - glslang\UserM_Release\ - glslang\UserM_Release\ - glslang\UserM_Release\ - glslang\UserM_Release\ - false - false - false - false - false - false - false - false - .lib - .lib - .lib - .lib - .lib - .lib - .lib - .lib - false - false - false - false - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - ProgramDatabase - Cdecl - Default - MultiThreadedDebug - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - ProgramDatabase - Cdecl - Default - MultiThreadedDebug - true - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - ProgramDatabase - Cdecl - Default - MultiThreadedDebugDLL - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - ProgramDatabase - Cdecl - Default - MultiThreadedDebugDLL - true - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - ProgramDatabase - Cdecl - Default - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - ProgramDatabase - Cdecl - Default - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - false - Default - MultiThreadedDLL - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - ProgramDatabase - Cdecl - Default - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;%(PreprocessorDefinitions) - true - false - Default - MultiThreadedDLL - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - ProgramDatabase - Cdecl - Default - - - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q - - - - - - 4065 - 4065 - 4065 - 4065 - 4065 - 4065 - 4065 - 4065 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - true - true - true - true - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - Executing Bison on glslang.y - Executing Bison on glslang.y - Executing Bison on glslang.y - Executing Bison on glslang.y - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - Executing Bison on glslang.y - Executing Bison on glslang.y - Executing Bison on glslang.y - Executing Bison on glslang.y - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - - - - - - diff --git a/glslang.vcxproj.filters b/glslang.vcxproj.filters deleted file mode 100644 index 5110deae..00000000 --- a/glslang.vcxproj.filters +++ /dev/null @@ -1,204 +0,0 @@ - - - - - {593f06dd-7981-4cb7-91ba-eae633fa547e} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;y;l - - - {564543b5-6302-49ab-9d24-bd6bef91274a} - - - {d4faa328-f693-4b77-9fcb-9629ca0d8ee8} - - - {c79e7f4d-1836-4b72-b201-46e72e4e4b6b} - - - {d48b8f48-5784-4cb6-bead-7f98647a1c44} - - - {092b92ee-743a-407d-ad9b-92af399715d6} - - - {0c27903f-6ef2-4725-9d9c-70f50aeaa7a1} - - - {f25a01e9-79ce-49bf-b79a-d10de89a0fec} - - - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - OSDependent\Windows - - - OSDependent\Windows - - - OSDependent\Linux - - - Machine Independent\Generated Source - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Public - - - OSDependent\Windows - - - OSDependent\Linux - - - Machine Independent\Generated Source - - - Machine Independent - - - Machine Independent - - - Machine Independent - - - Machine Independent\Preprocessor - - - Machine Independent\Preprocessor - - - Machine Independent - - - - - Machine Independent - - - diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt index f8b1799b..878eca5d 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt @@ -1,12 +1,9 @@ cmake_minimum_required(VERSION 2.8) -include_directories(MachineIndependent ../OGLCompilersDLL ${CMAKE_CURRENT_BINARY_DIR}) if(WIN32) add_subdirectory(OSDependent/Windows) - include_directories(${include_directories} OSDependent/Windows) elseif(UNIX) - add_subdirectory(OSDependent/Linux) - include_directories(${include_directories} OSDependent/Linux) + add_subdirectory(OSDependent/Unix) else(WIN32) message("unkown platform") endif(WIN32) @@ -75,18 +72,18 @@ endif() # Always use a custom command since our use of --defines isn't assumed by CMake's BISON_TARGET, # which ends up causing the target to always be rebuilt. -add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp.h - COMMAND ${BISON_EXECUTABLE} --defines=${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp.h -t MachineIndependent/glslang.y -o ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp +add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp.h + COMMAND ${BISON_EXECUTABLE} --defines=${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp.h -t ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang.y -o ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp MAIN_DEPENDENCY MachineIndependent/glslang.y WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp) +set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) if(WIN32) source_group("Public" REGULAR_EXPRESSION "Public/*") source_group("MachineIndependent" REGULAR_EXPRESSION "MachineIndependent/[^/]*") - source_group("Generated Files" FILES ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp ${CMAKE_CURRENT_BINARY_DIR}/glslang_tab.cpp.h) + source_group("Generated Files" FILES MachineIndependent/glslang_tab.cpp MachineIndependent/glslang_tab.cpp.h) source_group("Include" REGULAR_EXPRESSION "Include/[^/]*") source_group("GenericCodeGen" REGULAR_EXPRESSION "GenericCodeGen/*") source_group("MachineIndependent\\Preprocessor" REGULAR_EXPRESSION "MachineIndependent/preprocessor/*") diff --git a/glslang/GenericCodeGen/Makefile b/glslang/GenericCodeGen/Makefile deleted file mode 100644 index 44b0fd2a..00000000 --- a/glslang/GenericCodeGen/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -CC = g++ - -OBJECTS = CodeGen.o Link.o -AR=ar - -SRCS=CodeGen.cpp Link.cpp - -CPPFLAGS = -fPIC - -default : all -all : libCodeGen.a - -libCodeGen.a : $(OBJECTS) - $(AR) rvu $@ $(OBJECTS) - ranlib $@ - -%.o : %.cpp - $(CC) -c $(CPPFLAGS) $< - -# -# Cleanup -# -.PHONY : clean -clean : - $(RM) *.o *.a - -depend: - makedepend -- $(CFLAGS) -- $(SRCS) -# DO NOT DELETE - -CodeGen.o: ../Include/Common.h ../Include/PoolAlloc.h ../Include/ShHandle.h -CodeGen.o: ../Public/ShaderLang.h -CodeGen.o: ../Include/InfoSink.h -Link.o: ../Include/Common.h ../Include/PoolAlloc.h ../Include/ShHandle.h -Link.o: ../Public/ShaderLang.h -Link.o: ../Include/InfoSink.h diff --git a/glslang/MachineIndependent/Makefile b/glslang/MachineIndependent/Makefile deleted file mode 100644 index 2cebf0fb..00000000 --- a/glslang/MachineIndependent/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -INCLUDE = -I. -I.. -I../.. -I../Include -I../Public -I../OSDependent/Linux -I../../OGLCompilersDLL -INCPREPROCESSOR=./preprocessor -INCCODEGEN=./../GenericCodeGen -INCOSDEPENDENT=./../OSDependent/Linux/ -INCINITIALISATION=./../../OGLCompilersDLL/ -LIBPREPROCESSOR=./preprocessor/libPreprocessor.a -LIBOSDEPENDENT=./../OSDependent/Linux/libOssource.a -LIBINITIALISATION=./../../OGLCompilersDLL/libInitializeDll.a -LIBCODEGEN=./../GenericCodeGen/libCodeGen.a - -CXXFLAGS += $(DEFINE) $(INCLUDE) -fPIC -SHAREDOBJECT=./lib/libglslang.so - -SRCS= gen_glslang_tab.cpp Initialize.cpp IntermTraverse.cpp \ - Intermediate.cpp ParseHelper.cpp PoolAlloc.cpp limits.cpp \ - RemoveTree.cpp ShaderLang.cpp SymbolTable.cpp intermOut.cpp \ - parseConst.cpp InfoSink.cpp Versions.cpp Constant.cpp Scan.cpp \ - linkValidate.cpp reflection.cpp -OBJECTS := $(SRCS:.cpp=.o) -DEPS := $(addprefix ., $(SRCS:.cpp=.d)) - -all: $(SHAREDOBJECT) - -$(SHAREDOBJECT): $(OBJECTS) $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION) - $(CXX) -fPIC -shared -o $@ -rdynamic -Wl,-whole-archive $(OBJECTS) $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION) -Wl,-no-whole-archive - cp $@ ../../Test - cp $@ ../../Install/Linux - -gen_glslang_tab.o : gen_glslang_tab.cpp - $(CXX) -fPIC -c $(INCLUDE) gen_glslang_tab.cpp -o $@ - -gen_glslang_tab.cpp glslang_tab.h: glslang.y - @echo Generating gen_glslang_tab.cpp - bison -t -v -d glslang.y - mv glslang.tab.c gen_glslang_tab.cpp - mv glslang.tab.h glslang_tab.cpp.h - --include $(DEPS) - -%.o : %.cpp - $(CXX) $(CXXFLAGS) -MMD -MP -MF $(addprefix ., $(<:.cpp=.d)) -c -o $@ $< - -$(LIBPREPROCESSOR): - $(MAKE) -C $(INCPREPROCESSOR) - -$(LIBCODEGEN): - $(MAKE) -C $(INCCODEGEN) - -$(LIBINITIALISATION): - $(MAKE) -C $(INCINITIALISATION) - -$(LIBOSDEPENDENT): - $(MAKE) -C $(INCOSDEPENDENT) - -# -# Cleanup -# -clean : - $(RM) *.o *.a gen_glslang_tab.cpp glslang_tab.cpp glslang_tab.cpp.h glslang_tab.h glslang.output - $(RM) ./lib/*.so - $(MAKE) -C $(INCPREPROCESSOR) clean - $(MAKE) -C $(INCCODEGEN) clean - $(MAKE) -C $(INCINITIALISATION) clean - $(MAKE) -C $(INCOSDEPENDENT) clean - -.PHONY : clean $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION) diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index 8a9b2694..96e18f63 100644 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -37,7 +37,7 @@ #include "ParseHelper.h" #include "Scan.h" -#include "osinclude.h" +#include "../OSDependent/osinclude.h" #include #include diff --git a/glslang/MachineIndependent/PoolAlloc.cpp b/glslang/MachineIndependent/PoolAlloc.cpp index 7b018049..12f45cb8 100644 --- a/glslang/MachineIndependent/PoolAlloc.cpp +++ b/glslang/MachineIndependent/PoolAlloc.cpp @@ -36,7 +36,7 @@ #include "../Include/Common.h" #include "../Include/InitializeGlobals.h" -#include "osinclude.h" +#include "../OSDependent/osinclude.h" namespace glslang { diff --git a/glslang/MachineIndependent/preprocessor/Makefile b/glslang/MachineIndependent/preprocessor/Makefile deleted file mode 100644 index 19fedc34..00000000 --- a/glslang/MachineIndependent/preprocessor/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -INCLUDE = -I../ - -CXXFLAGS=$(DEFINE) $(INCLUDE) -fPIC - -SRCS := PpAtom.cpp PpScanner.cpp PpTokens.cpp Pp.cpp PpContext.cpp PpMemory.cpp PpSymbols.cpp -OBJECTS := $(SRCS:.cpp=.o) -DEPS := $(addprefix ., $(SRCS:.cpp=.d)) - -all : libPreprocessor.a - -libPreprocessor.a : $(OBJECTS) - $(AR) rvu $@ $(OBJECTS) - ranlib $@ - --include $(DEPS) - -%.o : %.cpp - $(CXX) $(CXXFLAGS) -MMD -MP -MF $(addprefix ., $(<:.cpp=.d)) -c -o $@ $< - -# -# Cleanup -# -.PHONY : clean -clean : - $(RM) *.o *.a diff --git a/glslang/OSDependent/Linux/Makefile b/glslang/OSDependent/Linux/Makefile deleted file mode 100644 index e09ad49a..00000000 --- a/glslang/OSDependent/Linux/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -#### -#### This Makefile should be used in the Linux Compiler build. This Makefile build the OSDependent -#### component as a static library. -#### - -# -# Compilation related -# -INCLUDE = -I. -I../.. -I../../Include -I../../../OGLCompilersDLL -WARNINGS = -Wall -Wwrite-strings -Wpointer-arith -Wcast-align -Wstrict-prototypes \ - -Wnested-externs - -CPP = g++ -CPPOPTIONS = -O3 -Wno-deprecated -D_ALT_NS=1 -fPIC -CPPOPTIONS = -g -Wno-deprecated -D_ALT_NS=1 -fPIC -CPPFLAGS = $(CPPOPTIONS) $(INCLUDE) - -# -# Linking related -# -AR = ar -STATIC_OPTION = rcs - -# -# Misc -# -export PERL = perl -export RM = rm -f -export MV = mv -f -export DEPEND = g++ -M - -# -# Object file variables are defined here. -# -OSSRCS = ossource.cpp -OSOBJS = ossource.o - -LIBNAME = libOssource.a - -all : $(LIBNAME) - -$(LIBNAME) : $(OSOBJS) - $(AR) $(STATIC_OPTION) $(LIBNAME) $(OSOBJS) - -%.o : %.cpp - $(CPP) $(CPPFLAGS) -c $< - - -# -# Dependency -# -depend : $(OSSRCS) - $(DEPEND) $(CPPFLAGS) $(OSSRCS) > depend -include depend - -# -# Cleanup -# -.PHONY : clean -clean : - $(RM) *.o *.a diff --git a/glslang/OSDependent/Linux/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt similarity index 76% rename from glslang/OSDependent/Linux/CMakeLists.txt rename to glslang/OSDependent/Unix/CMakeLists.txt index c2c6ad80..1480780b 100644 --- a/glslang/OSDependent/Linux/CMakeLists.txt +++ b/glslang/OSDependent/Unix/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.8) -include_directories(. ../../../OGLCompilersDLL) - add_library(OSDependent STATIC ossource.cpp osinclude.h) install(TARGETS OSDependent diff --git a/glslang/OSDependent/Linux/osinclude.h b/glslang/OSDependent/Unix/osinclude.h similarity index 100% rename from glslang/OSDependent/Linux/osinclude.h rename to glslang/OSDependent/Unix/osinclude.h diff --git a/glslang/OSDependent/Linux/ossource.cpp b/glslang/OSDependent/Unix/ossource.cpp similarity index 100% rename from glslang/OSDependent/Linux/ossource.cpp rename to glslang/OSDependent/Unix/ossource.cpp diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt index 2fcb2c63..be7f93a9 100644 --- a/glslang/OSDependent/Windows/CMakeLists.txt +++ b/glslang/OSDependent/Windows/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 2.8) -include_directories(. ../../../OGLCompilersDLL) - set(SOURCES ossource.cpp osinclude.h) add_library(OSDependent STATIC ${SOURCES}) diff --git a/glslang/OSDependent/osinclude.h b/glslang/OSDependent/osinclude.h new file mode 100644 index 00000000..ca262420 --- /dev/null +++ b/glslang/OSDependent/osinclude.h @@ -0,0 +1,46 @@ +// +//Copyright (C) 2002-2005 3Dlabs Inc. Ltd. +//All rights reserved. +// +//Redistribution and use in source and binary forms, with or without +//modification, are permitted provided that the following conditions +//are met: +// +// Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following +// disclaimer in the documentation and/or other materials provided +// with the distribution. +// +// Neither the name of 3Dlabs Inc. Ltd. nor the names of its +// contributors may be used to endorse or promote products derived +// from this software without specific prior written permission. +// +//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +//POSSIBILITY OF SUCH DAMAGE. +// + +#ifndef __ROOT_OSINCLUDE_H +#define __ROOT_OSINCLUDE_H + +#if defined(GLSLANG_OSINCLUDE_WIN32) +#include "Windows/osinclude.h" +#elif defined(GLSLANG_OSINCLUDE_UNIX) +#include "Unix/osinclude.h" +#else +#error "Unknown platform" +#endif + +#endif // __ROOT_OSINCLUDE_H diff --git a/glslang_vs2010.vcxproj b/glslang_vs2010.vcxproj deleted file mode 100644 index 64e04660..00000000 --- a/glslang_vs2010.vcxproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - glslang - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3} - - - - StaticLibrary - false - MultiByte - v100 - - - StaticLibrary - false - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - StaticLibrary - MultiByte - v100 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - lib\x86\Debug\ - lib\x64\Debug\ - glslang\UserM_Debug\ - glslang\UserM_Debug64\ - false - false - lib\x86\Release\ - lib\x64\Release\ - glslang\UserM_Release\ - glslang\UserM_Release64\ - false - false - false - false - .lib - .lib - .lib - .lib - false - false - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - OldStyle - Cdecl - Default - MultiThreadedDebug - true - /d2Zi+ %(AdditionalOptions) - true - false - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - OldStyle - Cdecl - Default - MultiThreadedDebug - true - /d2Zi+ %(AdditionalOptions) - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - MachineX64 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - OldStyle - Cdecl - Default - /d2Zi+ %(AdditionalOptions) - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - OldStyle - Cdecl - Default - /d2Zi+ %(AdditionalOptions) - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - MachineX64 - - - - - - 4065 - 4065 - 4065 - 4065 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - true - true - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - Executing Bison on glslang.y - Executing Bison on glslang.y - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - Executing Bison on glslang.y - Executing Bison on glslang.y - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - - - - - - diff --git a/glslang_vs2013.vcxproj b/glslang_vs2013.vcxproj deleted file mode 100644 index df9bb2a2..00000000 --- a/glslang_vs2013.vcxproj +++ /dev/null @@ -1,405 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - glslang - {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3} - - - - StaticLibrary - false - MultiByte - v120_xp - - - StaticLibrary - false - MultiByte - v120_xp - - - StaticLibrary - MultiByte - v120_xp - - - StaticLibrary - MultiByte - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - lib\2013\x86\Debug\ - lib\2013\x64\Debug\ - glslang\UserM_Debug\ - glslang\UserM_Debug64\ - false - false - lib\2013\x86\Release\ - lib\2013\x64\Release\ - glslang\UserM_Release\ - glslang\UserM_Release64\ - false - false - false - false - .lib - .lib - .lib - .lib - false - false - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - OldStyle - Cdecl - Default - MultiThreadedDebug - true - /d2Zi+ %(AdditionalOptions) - true - false - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - - - Disabled - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - false - EnableFastChecks - - - $(IntDir) - $(IntDir) - $(IntDir) - - - Level3 - true - OldStyle - Cdecl - Default - MultiThreadedDebug - true - /d2Zi+ %(AdditionalOptions) - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - false - libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Debug/glslang.pdb - Console - UserM_Debug/generic/glslang.lib - $(IntDir)$(TargetName)$(TargetExt) - - - UserM_Debug/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - _DEBUG;%(PreprocessorDefinitions) - 0x0809 - - - MachineX64 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - OldStyle - Cdecl - Default - /d2Zi+ %(AdditionalOptions) - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - - - MaxSpeed - OnlyExplicitInline - true - glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) - true - false - Default - MultiThreaded - true - true - - - UserM_Release/ - UserM_Release/ - - - - - Level3 - true - OldStyle - Cdecl - Default - /d2Zi+ %(AdditionalOptions) - true - - - /MACHINE:I386 %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - UserM_Release/generic/glslang.dll - true - libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) - true - UserM_Release/generic/glslang.pdb - Console - true - true - UserM_Release/generic/glslang.lib - - - UserM_Release/generic/glslang.tlb - - - copy dll - del Test\$(TargetName)$(TargetExt) -xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test - - - NDEBUG;%(PreprocessorDefinitions) - 0x0809 - - - MachineX64 - - - - - - 4065 - 4065 - 4065 - 4065 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - true - true - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.obj - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Document - Executing Bison on glslang.y - Executing Bison on glslang.y - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - Executing Bison on glslang.y - Executing Bison on glslang.y - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple -SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple -cd %(RootDir)%(Directory) -%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp - - - - - -