Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

consolidate files into btgui/OpenGLWindow (from FontFiles/OpenGLTrueTypeFont)

Browse Source 
consolidate stringify_linux/_osx into stringify.sh
This commit is contained in:
Erwin Coumans
2014-09-03 09:52:31 -07:00
parent d6c78426bd
commit 0125324bd6
30 changed files with 50 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
btgui/GwenOpenGLTest/Apple/premake4.lua
View File

@@ -1,51 +0,0 @@
if os.is("macosx") then
project "Gwen_OpenGLTest_Apple"
kind "ConsoleApp"
flags {"Unicode"}
defines { "GWEN_COMPILE_STATIC" , "_HAS_EXCEPTIONS=0", "_STATIC_CPPLIB" }
targetdir "../../../../bin"
includedirs
{
"../..","..","../../../rendertest","../../../../bullet2"
}
initOpenGL()
initGlew()
links {
"gwen","Cocoa.framework"
}
files {
"../../../rendertest/MacOpenGLWindow.mm",
"../../../rendertest/MacOpenGLWindow.h",
"../../../rendertest/TwFonts.cpp",
"../../../rendertest/TwFonts.h",
"../../../rendertest/LoadShader.cpp",
"../../../rendertest/LoadShader.h",
"../../../rendertest/GLPrimitiveRenderer.cpp",
"../../../rendertest/GLPrimitiveRenderer.h",
"../../../rendertest/GwenOpenGL3CoreRenderer.h",
"../../../OpenGLTrueTypeFont/fontstash.cpp",
"../../../OpenGLTrueTypeFont/fontstash.h",
"../../../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../../../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../../../../bullet2/LinearMath/b3ConvexHullComputer.cpp",
"../../../../bullet2/LinearMath/b3ConvexHullComputer.h",
"../../../../bullet2/LinearMath/btSerializer.cpp",
"../../../../bullet2/LinearMath/btSerializer.h",
"../../../../bullet2/LinearMath/b3AlignedAllocator.cpp",
"../../../../bullet2/LinearMath/b3Quickprof.cpp",
"../../../../bullet2/LinearMath/b3Quickprof.h",
"../**.cpp",
"../**.h",
}
end

2
btgui/GwenOpenGLTest/OpenGLSample.cpp
View File

@@ -21,7 +21,7 @@ extern char OpenSansData[];
#endif //_WIN32
#endif//__APPLE__
#include "OpenGLTrueTypeFont/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/opengl_fontstashcallbacks.h"
#include "OpenGLWindow/GwenOpenGL3CoreRenderer.h"
#include "OpenGLWindow/GLPrimitiveRenderer.h"

10
btgui/GwenOpenGLTest/premake4.lua
View File

@@ -25,7 +25,7 @@
files {
"../FontFiles/OpenSans.cpp",
"../OpenGLWindow/OpenSans.cpp",
"../OpenGLWindow/TwFonts.cpp",
"../OpenGLWindow/TwFonts.h",
"../OpenGLWindow/LoadShader.cpp",
@@ -33,10 +33,10 @@
"../OpenGLWindow/GLPrimitiveRenderer.cpp",
"../OpenGLWindow/GLPrimitiveRenderer.h",
"../OpenGLWindow/GwenOpenGL3CoreRenderer.h",
"../OpenGLTrueTypeFont/fontstash.cpp",
"../OpenGLTrueTypeFont/fontstash.h",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.cpp",
"../OpenGLTrueTypeFont/opengl_fontstashcallbacks.h",
"../OpenGLWindow/fontstash.cpp",
"../OpenGLWindow/fontstash.h",
"../OpenGLWindow/opengl_fontstashcallbacks.cpp",
"../OpenGLWindow/opengl_fontstashcallbacks.h",
"../../btgui/Timing/b3Clock.cpp",
"../../btgui/Timing/b3Clock.h",
"**.cpp",