Set up infrastructure for installing an executable. Changes the standalone name to glslangValidator.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22593 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
53f3cc977d
commit
54f6e5661d
8 changed files with 82 additions and 319 deletions
|
|
@ -7,10 +7,12 @@ TARGETOBJECT=StandAlone.o
|
|||
|
||||
default: all
|
||||
|
||||
all: StandAlone
|
||||
all: glslangValidator
|
||||
|
||||
StandAlone: $(TARGETOBJECT) SHAREDOBJECT
|
||||
$(CC) -g -o $@ $(TARGETOBJECT) -L $(LIBPATH) -lglslang -lpthread -lm -lstdc++
|
||||
glslangValidator: $(TARGETOBJECT) SHAREDOBJECT
|
||||
$(CC) -g -o $@ $(TARGETOBJECT) -L $(LIBPATH) -lglslang -lpthread -lm -lstdc++
|
||||
cp $@ ../Test
|
||||
cp $@ ../Install/Linux
|
||||
|
||||
SHAREDOBJECT:
|
||||
cd $(OBJECTPATH); make all
|
||||
|
|
@ -23,7 +25,7 @@ SHAREDOBJECT:
|
|||
#
|
||||
.PHONY : clean
|
||||
clean :
|
||||
$(RM) *.o StandAlone
|
||||
$(RM) *.o glslangValidator ../Install/Linux/glslangValidator
|
||||
cd $(OBJECTPATH); make clean
|
||||
|
||||
depend:
|
||||
|
|
|
|||
|
|
@ -138,13 +138,15 @@ bool ProcessArguments(int argc, char* argv[])
|
|||
DebugOptions |= EDebugOpTexturePrototypes;
|
||||
break;
|
||||
default:
|
||||
usage();
|
||||
return false;
|
||||
}
|
||||
} else
|
||||
Worklist.add(std::string(argv[0]));
|
||||
}
|
||||
|
||||
if (Worklist.empty())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -187,8 +189,10 @@ int C_DECL main(int argc, char* argv[])
|
|||
// Init for for standalone
|
||||
glslang::InitGlobalLock();
|
||||
|
||||
if (! ProcessArguments(argc, argv))
|
||||
if (! ProcessArguments(argc, argv)) {
|
||||
usage();
|
||||
return EFailUsage;
|
||||
}
|
||||
|
||||
// TODO: finish threading, allow external control over number of threads
|
||||
const int NumThreads = 1;
|
||||
|
|
|
|||
|
|
@ -69,6 +69,11 @@ namespace glslang {
|
|||
return true;
|
||||
}
|
||||
|
||||
bool empty()
|
||||
{
|
||||
return worklist.empty();
|
||||
}
|
||||
|
||||
protected:
|
||||
std::list<std::string> worklist;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue