diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index 29022315fa3dec85fef775ba224ccd9bd4f6cbab..4c60c4a192890c80906eac64e2fcef46cf95f93f 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8) include_directories(.) if(WIN32) - include_directories(${include_directories} ../glslang/OSDependent/Windows) + include_directories(../glslang/OSDependent/Windows) elseif(UNIX) - include_directories(${include_directories} ../glslang/OSDependent/Linux) + include_directories(../glslang/OSDependent/Linux) else(WIN32) message("unkown platform") endif(WIN32) diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index da6f10a35286de294769aeaf2d0d1709b83c5e5b..10da8e16da19fab6b61a0836b0021a1fc8be74c0 100644 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -428,7 +428,7 @@ void ProcessConfigFile() glslang::TWorklist Worklist; // array of unique places to leave the shader names and infologs for the asynchronous compiles -glslang::TWorkItem **Work = 0; +glslang::TWorkItem** Work = 0; int NumWorkItems = 0; int Options = 0; @@ -455,7 +455,7 @@ bool ProcessArguments(int argc, char* argv[]) { ExecutableName = argv[0]; NumWorkItems = argc; // will include some empties where the '-' options were, but it doesn't matter, they'll be 0 - Work = new glslang::TWorkItem*[NumWorkItems]; + Work = new glslang::TWorkItem*[NumWorkItems]; Work[0] = 0; argc--; diff --git a/glslang/Public/ShaderLang.h b/glslang/Public/ShaderLang.h index b5cd58e80a33ace58ef9852a70928fa744c7c782..4ca1c0d545c081744a534c7b83b9026c5cb14101 100644 --- a/glslang/Public/ShaderLang.h +++ b/glslang/Public/ShaderLang.h @@ -190,7 +190,7 @@ SH_IMPORT_EXPORT int ShLink( const int numHandles, ShHandle uniformMap, // updated with new uniforms short int** uniformsAccessed, // returned with indexes of uniforms accessed - int* numUniformsAccessed); + int* numUniformsAccessed); SH_IMPORT_EXPORT int ShLinkExt( const ShHandle, // linker object