mirror of
https://github.com/RPCS3/glslang.git
synced 2025-01-22 02:44:24 +00:00
Several miscellaneous portability improvements (no functional changes).
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24737 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
parent
68546c6ca4
commit
3cdc47bf0b
5
.gitignore
vendored
Normal file
5
.gitignore
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
*.o
|
||||
*.a
|
||||
*.so
|
||||
*.exe
|
||||
tags
|
@ -9,5 +9,5 @@
|
||||
// source have to figure out how to create revision.h just to get a build
|
||||
// going. However, if it is not updated, it can be a version behind.
|
||||
|
||||
#define GLSLANG_REVISION "24675"
|
||||
#define GLSLANG_DATE "2014/01/07 11:14:48"
|
||||
#define GLSLANG_REVISION "24692"
|
||||
#define GLSLANG_DATE "2014/01/08 16:25:18"
|
||||
|
@ -36,6 +36,7 @@ gen_glslang_tab.cpp glslang_tab.h: glslang.y
|
||||
@echo Generating gen_glslang_tab.cpp
|
||||
@dos2unix glslang.y
|
||||
bison -t -v -d glslang.y
|
||||
@unix2dos glslang.y
|
||||
mv glslang.tab.c gen_glslang_tab.cpp
|
||||
mv glslang.tab.h glslang_tab.cpp.h
|
||||
|
||||
@ -63,7 +64,7 @@ depend:
|
||||
#
|
||||
# Cleanup
|
||||
#
|
||||
.PHONY : clean
|
||||
.PHONY : clean $(LIBPREPROCESSOR) $(LIBCODEGEN) $(LIBOSDEPENDENT) $(LIBINITIALISATION)
|
||||
clean :
|
||||
$(RM) *.o *.a gen_glslang_tab.cpp glslang_tab.cpp glslang_tab.cpp.h glslang_tab.h glslang.output
|
||||
$(RM) ./lib/*.so
|
||||
|
@ -53,8 +53,8 @@ void DetachThreadLinux(void *);
|
||||
//
|
||||
// Thread Local Storage Operations
|
||||
//
|
||||
typedef unsigned int OS_TLSIndex;
|
||||
#define OS_INVALID_TLS_INDEX 0xFFFFFFFF
|
||||
typedef pthread_key_t OS_TLSIndex;
|
||||
#define OS_INVALID_TLS_INDEX ((pthread_key_t)0xFFFFFFFF)
|
||||
|
||||
OS_TLSIndex OS_AllocTLSIndex();
|
||||
bool OS_SetTLSValue(OS_TLSIndex nIndex, void *lpvValue);
|
||||
|
@ -46,7 +46,9 @@
|
||||
#define SH_IMPORT_EXPORT
|
||||
#else
|
||||
#define SH_IMPORT_EXPORT
|
||||
#ifndef __fastcall
|
||||
#define __fastcall
|
||||
#endif
|
||||
#define C_DECL
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user