Commit ee6a9c8b by John Kessenich

Make previous check in compile correctly on linux.

parent 2b07c7e7
#! /bin/bash #! /bin/bash
rm StandAlone/StandAlone rm -f StandAlone/StandAlone
# build the StandAlone app and all it's dependencies # build the StandAlone app and all it's dependencies
make -C StandAlone make -C StandAlone
......
...@@ -10,14 +10,13 @@ default: all ...@@ -10,14 +10,13 @@ default: all
all: StandAlone all: StandAlone
StandAlone: $(TARGETOBJECT) SHAREDOBJECT StandAlone: $(TARGETOBJECT) SHAREDOBJECT
$(CC) -g -o $@ $(TARGETOBJECT) -L $(LIBPATH) -lglslang -lpthread \ $(CC) -g -o $@ $(TARGETOBJECT) -L $(LIBPATH) -lglslang -lpthread -lm -lstdc++
-lm -lstdc++
SHAREDOBJECT: SHAREDOBJECT:
cd $(OBJECTPATH); make all cd $(OBJECTPATH); make all
%.o : %.cpp %.o : %.cpp
$(CC) -g -c $< $(CC) -g -c -I../glslang/OSDependent/Linux $<
# #
# Cleanup # Cleanup
...@@ -37,4 +36,4 @@ StandAlone.o: ./../glslang/Public/ShaderLang.h ...@@ -37,4 +36,4 @@ StandAlone.o: ./../glslang/Public/ShaderLang.h
StandAlone.o: ./../glslang/Include/InfoSink.h ./../glslang/Include/Common.h StandAlone.o: ./../glslang/Include/InfoSink.h ./../glslang/Include/Common.h
StandAlone.o: ./../glslang/Include/PoolAlloc.h StandAlone.o: ./../glslang/Include/PoolAlloc.h
StandAlone.o: ./../glslang/Public/ShaderLang.h StandAlone.o: ./../glslang/Public/ShaderLang.h
StandAlone.o: Worklist.h
...@@ -149,7 +149,11 @@ bool ProcessArguments(int argc, char* argv[]) ...@@ -149,7 +149,11 @@ bool ProcessArguments(int argc, char* argv[])
} }
// Thread entry point // Thread entry point
unsigned int __stdcall CompileShaders(void*) unsigned int
#ifdef _WIN32
__stdcall
#endif
CompileShaders(void*)
{ {
ShHandle compiler; ShHandle compiler;
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#define WORKLIST_H_INCLUDED #define WORKLIST_H_INCLUDED
#include "osinclude.h" #include "osinclude.h"
#include <string>
#include <list> #include <list>
namespace glslang { namespace glslang {
......
...@@ -43,8 +43,6 @@ ...@@ -43,8 +43,6 @@
#include <semaphore.h> #include <semaphore.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include "Include/InitializeGlobals.h"
#include "Include/PoolAlloc.h"
#define _vsnprintf vsnprintf #define _vsnprintf vsnprintf
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment