fix mac build
This commit is contained in:
@@ -59,3 +59,11 @@
|
||||
"../OpenGLWindow/X11OpenGLWindow.cpp"
|
||||
}
|
||||
end
|
||||
if os.is("MacOSX") then
|
||||
links{"Cocoa.framework"}
|
||||
print("hello!")
|
||||
files{
|
||||
"../OpenGLWindow/MacOpenGLWindow.mm",
|
||||
"../OpenGLWindow/MacOpenGLWindow.h",
|
||||
}
|
||||
end
|
||||
|
||||
@@ -47,15 +47,14 @@
|
||||
"../OpenGLWindow/X11OpenGLWindow.h",
|
||||
"../OpenGLWindow/X11OpenGLWindow.cpp"
|
||||
}
|
||||
end
|
||||
|
||||
if os.is("MacOSX") then
|
||||
links {"BulletFileLoader"}
|
||||
if os.is("MacOSX") then
|
||||
links { "Cocoa.framework" }
|
||||
files{
|
||||
"../OpenGLWindow/MacOpenGLWindow.h",
|
||||
"../OpenGLWindow/MacOpenGLWindow.mm",
|
||||
}
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -62,3 +62,12 @@
|
||||
"X11OpenGLWindows.h"
|
||||
}
|
||||
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
0
build/premake4_osx
Normal file → Executable file
@@ -6,11 +6,11 @@
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include "MacOpenGLWindow.h"
|
||||
#include "OpenGLWindow/MacOpenGLWindow.h"
|
||||
#elif defined _WIN32
|
||||
#include "OpenGLWindow/Win32OpenGLWindow.h"
|
||||
#elif defined __linux
|
||||
#include "../rendering/rendertest/X11OpenGLWindow.h"
|
||||
#include "OpenGLWindow/X11OpenGLWindow.h"
|
||||
#endif
|
||||
|
||||
#include "OpenGLWindow/GLPrimitiveRenderer.h"
|
||||
|
||||
@@ -84,10 +84,17 @@ function createProject(vendor)
|
||||
"../../btgui/OpenGLWindow/X11OpenGLWindows.h"
|
||||
}
|
||||
end
|
||||
if os.is("MacOSX") then
|
||||
links {"Cocoa.framework"}
|
||||
files {
|
||||
"../../btgui/OpenGLWindow/MacOpenGLWindow.h",
|
||||
"../../btgui/OpenGLWindow/MacOpenGLWindow.mm",
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
createProject("Apple")
|
||||
createProject("AMD")
|
||||
createProject("Intel")
|
||||
createProject("NVIDIA")
|
||||
createProject("NVIDIA")
|
||||
|
||||
Reference in New Issue
Block a user