Make previous check in compile correctly on linux.

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

diff --git a/BuildLinux.sh b/BuildLinux.sh
index 44f655f..b53578a 100755 (executable)
--- a/BuildLinux.sh
+++ b/BuildLinux.sh
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-rm StandAlone/StandAlone
+rm -f StandAlone/StandAlone
 
 # build the StandAlone app and all it's dependencies
 make -C StandAlone

diff --git a/StandAlone/Makefile b/StandAlone/Makefile
index 4337237..793086a 100644 (file)
--- a/StandAlone/Makefile
+++ b/StandAlone/Makefile
@@ -10,14 +10,13 @@ default: all
 all: StandAlone
 
 StandAlone: $(TARGETOBJECT) SHAREDOBJECT
-       $(CC) -g -o $@ $(TARGETOBJECT) -L $(LIBPATH) -lglslang -lpthread \
-       -lm -lstdc++
+       $(CC) -g -o $@ $(TARGETOBJECT) -L $(LIBPATH) -lglslang -lpthread -lm -lstdc++ 
 
 SHAREDOBJECT:
        cd $(OBJECTPATH); make all
 
 %.o : %.cpp
-       $(CC) -g -c $<
+       $(CC) -g -c -I../glslang/OSDependent/Linux $<
 
 #
 # Cleanup
@@ -37,4 +36,4 @@ StandAlone.o: ./../glslang/Public/ShaderLang.h
 StandAlone.o: ./../glslang/Include/InfoSink.h ./../glslang/Include/Common.h
 StandAlone.o: ./../glslang/Include/PoolAlloc.h
 StandAlone.o: ./../glslang/Public/ShaderLang.h
-
+StandAlone.o: Worklist.h

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index fdf7490..00644c5 100644 (file)
--- a/StandAlone/StandAlone.cpp
+++ b/StandAlone/StandAlone.cpp
@@ -149,7 +149,11 @@ bool ProcessArguments(int argc, char* argv[])
 }
 
 // Thread entry point
-unsigned int __stdcall CompileShaders(void*)
+unsigned int
+#ifdef _WIN32
+    __stdcall
+#endif
+    CompileShaders(void*)
 {
     ShHandle compiler;
 

diff --git a/StandAlone/Worklist.h b/StandAlone/Worklist.h
index 0c9a4ee..9776f1f 100644 (file)
--- a/StandAlone/Worklist.h
+++ b/StandAlone/Worklist.h
@@ -36,6 +36,7 @@
 #define WORKLIST_H_INCLUDED
 
 #include "osinclude.h"
+#include <string>
 #include <list>
 
 namespace glslang {

diff --git a/glslang/OSDependent/Linux/osinclude.h b/glslang/OSDependent/Linux/osinclude.h
index 4de9977..f7888d0 100644 (file)
--- a/glslang/OSDependent/Linux/osinclude.h
+++ b/glslang/OSDependent/Linux/osinclude.h
@@ -43,8 +43,6 @@
 #include <semaphore.h>
 #include <assert.h>
 #include <errno.h>
-#include "Include/InitializeGlobals.h"
-#include "Include/PoolAlloc.h"
 
 #define _vsnprintf vsnprintf