Merge pull request #144 from igoremykin/xcode5_compile_fix

Fixed compilation for MacOS with Xcode 5 (edited premake files only).
This commit is contained in:
Branimir Karadžić 2014-08-23 09:46:05 -07:00
commit 6c990179ee
4 changed files with 29 additions and 2 deletions

View file

@ -329,6 +329,15 @@ Visual Studio 2008 IDE:
start .build/projects/vs2008/bgfx.sln start .build/projects/vs2008/bgfx.sln
Xcode 5 IDE:
open .build/projects/xcode4/bgfx.xcworkspace
Due to [inability](http://industriousone.com/debugdir) to set working directory for an Xcode project from premake configuration file, it has to be set manually for each example project:
1. Open *"Edit scheme..."* dialog for a given project.
2. Select *"Run"* settings.
3. Check *"Use custom working directory"* and enter following path: `${PROJECT_DIR}/../../../examples/runtime`.
Linux 64-bit: Linux 64-bit:
make linux-release64 make linux-release64

View file

@ -43,7 +43,7 @@ function bgfxProject(_name, _uuid, _kind, _defines)
"gdi32", "gdi32",
} }
configuration { "osx or ios*" } configuration { "xcode4 or osx or ios*" }
files { files {
BGFX_DIR .. "src/**.mm", BGFX_DIR .. "src/**.mm",
} }
@ -53,7 +53,7 @@ function bgfxProject(_name, _uuid, _kind, _defines)
"Cocoa.framework", "Cocoa.framework",
} }
configuration { "vs* or linux or mingw or osx or ios*" } configuration { "vs* or linux or mingw or osx or xcode4 or ios*" }
includedirs { includedirs {
--nacl has GLES2 headers modified... --nacl has GLES2 headers modified...
BGFX_DIR .. "3rdparty/khronos", BGFX_DIR .. "3rdparty/khronos",

View file

@ -21,3 +21,8 @@ project ("example-common")
BGFX_DIR .. "examples/common/**.cpp", BGFX_DIR .. "examples/common/**.cpp",
BGFX_DIR .. "examples/common/**.h", BGFX_DIR .. "examples/common/**.h",
} }
configuration { "xcode4" }
includedirs {
BX_DIR .. "include/compat/osx",
}

View file

@ -134,6 +134,19 @@ function exampleProject(_name, _uuid)
-- "SDL2", -- "SDL2",
} }
configuration { "xcode4" }
platforms {
"Universal"
}
files {
BGFX_DIR .. "examples/common/**.mm",
}
links {
"Cocoa.framework",
"Foundation.framework",
"OpenGL.framework",
}
configuration { "ios*" } configuration { "ios*" }
kind "ConsoleApp" kind "ConsoleApp"
files { files {