Skip to content

Added support for mac arm & newer libraries #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
htahboub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for mac arm & newer libraries #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bgfx
Open in desktop
Submodule bgfx updated 2682 files
2 changes: 1 addition & 1 deletion bimg
Open in desktop
Submodule bimg updated 218 files
2 changes: 1 addition & 1 deletion bx
Open in desktop
Submodule bx updated 153 files
2 changes: 1 addition & 1 deletion glfw
Open in desktop
Submodule glfw updated 116 files
23 changes: 13 additions & 10 deletions premake5.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ solution "bgfx-minimal-example"
configurations { "Release", "Debug" }
if os.is64bit() and not os.istarget("windows") then
platforms "x86_64"
elseif os.istarget("macosx") and io.popen("uname -m"):read("*a"):match("%S+") == "arm64" then
platforms "ARM"
else
platforms { "x86", "x86_64" }
end
Expand All @@ -31,6 +33,8 @@ solution "bgfx-minimal-example"
}
optimize "Debug"
symbols "On"
filter "platforms:ARM"
architecture "ARM"
filter "platforms:x86"
architecture "x86"
filter "platforms:x86_64"
Expand All @@ -54,7 +58,7 @@ end
project "helloworld"
kind "ConsoleApp"
language "C++"
cppdialect "C++14"
cppdialect "C++17"
exceptionhandling "Off"
rtti "Off"
files "helloworld.cpp"
Expand All @@ -76,7 +80,7 @@ project "helloworld"
project "helloworld_mt"
kind "ConsoleApp"
language "C++"
cppdialect "C++14"
cppdialect "C++17"
exceptionhandling "Off"
rtti "Off"
files "helloworld_mt.cpp"
Expand All @@ -98,7 +102,7 @@ project "helloworld_mt"
project "bgfx"
kind "StaticLib"
language "C++"
cppdialect "C++14"
cppdialect "C++17"
exceptionhandling "Off"
rtti "Off"
defines "__STDC_FORMAT_MACROS"
Expand Down Expand Up @@ -138,7 +142,7 @@ project "bgfx"
project "bimg"
kind "StaticLib"
language "C++"
cppdialect "C++14"
cppdialect "C++17"
exceptionhandling "Off"
rtti "Off"
files
Expand All @@ -147,21 +151,21 @@ project "bimg"
path.join(BIMG_DIR, "src/image.cpp"),
path.join(BIMG_DIR, "src/image_gnf.cpp"),
path.join(BIMG_DIR, "src/*.h"),
path.join(BIMG_DIR, "3rdparty/astc-codec/src/decoder/*.cc")
path.join(BIMG_DIR, "3rdparty/astc-encoder/source/*.cpp")
}
includedirs
{
path.join(BX_DIR, "include"),
path.join(BIMG_DIR, "include"),
path.join(BIMG_DIR, "3rdparty/astc-codec"),
path.join(BIMG_DIR, "3rdparty/astc-codec/include"),
path.join(BIMG_DIR, "3rdparty/astc-encoder/include"),
path.join(BIMG_DIR, "3rdparty/astc-encoder/source"),
}
setBxCompat()

project "bx"
kind "StaticLib"
language "C++"
cppdialect "C++14"
cppdialect "C++17"
exceptionhandling "Off"
rtti "Off"
defines "__STDC_FORMAT_MACROS"
Expand Down Expand Up @@ -230,12 +234,11 @@ project "glfw"
files
{
path.join(GLFW_DIR, "src/cocoa_*.*"),
path.join(GLFW_DIR, "src/posix_thread.h"),
path.join(GLFW_DIR, "src/posix*.*"),
path.join(GLFW_DIR, "src/nsgl_context.h"),
path.join(GLFW_DIR, "src/egl_context.h"),
path.join(GLFW_DIR, "src/osmesa_context.h"),

path.join(GLFW_DIR, "src/posix_thread.c"),
path.join(GLFW_DIR, "src/nsgl_context.m"),
path.join(GLFW_DIR, "src/egl_context.c"),
path.join(GLFW_DIR, "src/nsgl_context.m"),
Expand Down