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

fix mac build

Browse Source
This commit is contained in:
Erwin Coumans
2013-03-13 14:02:49 -07:00
parent d8a3732306
commit 3ad76286e6
6 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
btgui/GwenOpenGLTest/premake4.lua
View File

@@ -59,3 +59,11 @@
"../OpenGLWindow/X11OpenGLWindow.cpp" "../OpenGLWindow/X11OpenGLWindow.cpp"
} }
end end
if os.is("MacOSX") then
links{"Cocoa.framework"}
print("hello!")
files{
"../OpenGLWindow/MacOpenGLWindow.mm",
"../OpenGLWindow/MacOpenGLWindow.h",
}
end

5
btgui/OpenGLTrueTypeFont/premake4.lua
View File

@@ -47,15 +47,14 @@
"../OpenGLWindow/X11OpenGLWindow.h", "../OpenGLWindow/X11OpenGLWindow.h",
"../OpenGLWindow/X11OpenGLWindow.cpp" "../OpenGLWindow/X11OpenGLWindow.cpp"
} }
end
if os.is("MacOSX") then if os.is("MacOSX") then
links {"BulletFileLoader"}
links { "Cocoa.framework" } links { "Cocoa.framework" }
files{ files{
"../OpenGLWindow/MacOpenGLWindow.h", "../OpenGLWindow/MacOpenGLWindow.h",
"../OpenGLWindow/MacOpenGLWindow.mm", "../OpenGLWindow/MacOpenGLWindow.mm",
} }
end
end end

9
btgui/OpenGLWindow/premake4.lua
View File

@@ -62,3 +62,12 @@
"X11OpenGLWindows.h" "X11OpenGLWindows.h"
} }
end end
if os.is("MacOSX") then
links{"Cocoa.framework"}
files
{
"../OpenGLWindow/MacOpenGLWindow.h",
"../OpenGLWindow/MacOpenGLWindow.mm",
}
end

0
build/premake4_osx Normal file → Executable file
View File

4
demo/gpudemo/main_opengl3core.cpp
View File

@@ -6,11 +6,11 @@
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include "MacOpenGLWindow.h" #include "OpenGLWindow/MacOpenGLWindow.h"
#elif defined _WIN32 #elif defined _WIN32
#include "OpenGLWindow/Win32OpenGLWindow.h" #include "OpenGLWindow/Win32OpenGLWindow.h"
#elif defined __linux #elif defined __linux
#include "../rendering/rendertest/X11OpenGLWindow.h" #include "OpenGLWindow/X11OpenGLWindow.h"
#endif #endif
#include "OpenGLWindow/GLPrimitiveRenderer.h" #include "OpenGLWindow/GLPrimitiveRenderer.h"

9
demo/gpudemo/premake4.lua
View File

@@ -84,10 +84,17 @@ function createProject(vendor)
"../../btgui/OpenGLWindow/X11OpenGLWindows.h" "../../btgui/OpenGLWindow/X11OpenGLWindows.h"
} }
end end
if os.is("MacOSX") then
links {"Cocoa.framework"}
files {
"../../btgui/OpenGLWindow/MacOpenGLWindow.h",
"../../btgui/OpenGLWindow/MacOpenGLWindow.mm",
}
end
end end
end end
createProject("Apple") createProject("Apple")
createProject("AMD") createProject("AMD")
createProject("Intel") createProject("Intel")
createProject("NVIDIA") createProject("NVIDIA")