Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-17 20:52:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

OSX: Added separate osx-arm64 build configuration.

Browse Source
This commit is contained in:
Бранимир Караџић
2020-12-31 18:17:39 -08:00
parent 3bc0362ed2
commit 76f3e0590f
9 changed files with 64 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/bgfx.lua
View File

@@ -138,7 +138,7 @@ function bgfxProjectBase(_kind, _defines)
"-Wno-microsoft-const-init", -- default initialization of an object of const type '' without a user-provided default constructor is a Microsoft extension
}
configuration { "osx" }
configuration { "osx*" }
buildoptions { "-x objective-c++" } -- additional build option for osx
linkoptions {
"-framework Cocoa",
@@ -232,7 +232,7 @@ function bgfxProjectBase(_kind, _defines)
path.join(BGFX_DIR, "src/vertexlayout.cpp"),
}
configuration { "xcode* or osx or ios*" }
configuration { "xcode* or osx* or ios*" }
files {
path.join(BGFX_DIR, "src/amalgamated.mm"),
}
@@ -243,7 +243,7 @@ function bgfxProjectBase(_kind, _defines)
path.join(BGFX_DIR, "src/amalgamated.cpp"),
}
configuration { "not (xcode* or osx or ios*)" }
configuration { "not (xcode* or osx* or ios*)" }
excludes {
path.join(BGFX_DIR, "src/**.mm"),
}
@@ -251,7 +251,7 @@ function bgfxProjectBase(_kind, _defines)
configuration {}
else
configuration { "xcode* or osx or ios*" }
configuration { "xcode* or osx* or ios*" }
files {
path.join(BGFX_DIR, "src/glcontext_**.mm"),
path.join(BGFX_DIR, "src/renderer_**.mm"),

2
scripts/example-common.lua
View File

@@ -77,7 +77,7 @@ project ("example-common")
}
end
configuration { "osx or ios* or tvos*" }
configuration { "osx* or ios* or tvos*" }
files {
path.join(BGFX_DIR, "examples/common/**.mm"),
}

6
scripts/genie.lua
View File

@@ -255,7 +255,7 @@ function exampleProjectDefaults()
}
end
configuration { "osx" }
configuration { "osx*" }
libdirs { "$(SDL2_DIR)/lib" }
configuration {}
@@ -280,7 +280,7 @@ function exampleProjectDefaults()
}
end
configuration { "osx" }
configuration { "osx*" }
linkoptions {
"-framework CoreVideo",
"-framework IOKit",
@@ -401,7 +401,7 @@ function exampleProjectDefaults()
"pthread",
}
configuration { "osx" }
configuration { "osx*" }
linkoptions {
"-framework Cocoa",
"-framework QuartzCore",

2
scripts/geometryc.lua
View File

@@ -33,7 +33,7 @@ project "geometryc"
"psapi",
}
configuration { "osx" }
configuration { "osx*" }
links {
"Cocoa.framework",
}

4
scripts/geometryv.lua
View File

@@ -52,7 +52,7 @@ project ("geometryv")
"Xcursor",
}
configuration { "osx" }
configuration { "osx*" }
linkoptions {
"-framework CoreVideo",
"-framework IOKit",
@@ -138,7 +138,7 @@ project ("geometryv")
"pthread",
}
configuration { "osx" }
configuration { "osx*" }
linkoptions {
"-framework Cocoa",
"-framework Metal",

30
scripts/shaderc.lua
View File

@@ -141,7 +141,7 @@ project "spirv-opt"
"/wd4706", -- warning C4706: assignment within conditional expression
}
configuration { "mingw* or linux or osx" }
configuration { "mingw* or linux* or osx*" }
buildoptions {
"-Wno-switch",
}
@@ -197,7 +197,7 @@ project "spirv-cross"
"/wd4715", -- warning C4715: '': not all control paths return a value
}
configuration { "mingw* or linux or osx" }
configuration { "mingw* or linux* or osx*" }
buildoptions {
"-Wno-type-limits",
}
@@ -268,12 +268,17 @@ project "glslang"
"/wd4838", -- warning C4838: conversion from 'spv::GroupOperation' to 'unsigned int' requires a narrowing conversion
}
configuration { "mingw* or linux or osx" }
configuration { "mingw* or linux*" }
buildoptions {
"-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough",
"-Wno-logical-op",
"-Wno-maybe-uninitialized",
}
configuration { "mingw* or linux* or osx*" }
buildoptions {
"-fno-strict-aliasing", -- glslang has bugs if strict aliasing is used.
"-Wno-ignored-qualifiers",
"-Wno-implicit-fallthrough",
"-Wno-missing-field-initializers",
"-Wno-reorder",
"-Wno-return-type",
@@ -287,7 +292,7 @@ project "glslang"
"-Wno-unused-variable",
}
configuration { "osx" }
configuration { "osx*" }
buildoptions {
"-Wno-c++11-extensions",
"-Wno-unused-const-variable",
@@ -299,11 +304,6 @@ project "glslang"
"-Wno-unused-but-set-variable",
}
configuration { "mingw* or linux or osx" }
buildoptions {
"-fno-strict-aliasing", -- glslang has bugs if strict aliasing is used.
}
configuration {}
project "glsl-optimizer"
@@ -530,7 +530,7 @@ project "glsl-optimizer"
"/wd4996", -- warning C4996: 'strdup': The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name: _strdup.
}
configuration { "mingw* or linux or osx" }
configuration { "mingw* or linux* or osx*" }
buildoptions {
"-fno-strict-aliasing", -- glsl-optimizer has bugs if strict aliasing is used.
@@ -545,7 +545,7 @@ project "glsl-optimizer"
"-Wshadow", -- glsl-optimizer is full of -Wshadow warnings ignore it.
}
configuration { "osx" }
configuration { "osx*" }
buildoptions {
"-Wno-deprecated-register",
}
@@ -641,7 +641,7 @@ project "shaderc"
configuration { "mingw-*" }
targetextension ".exe"
configuration { "osx" }
configuration { "osx*" }
links {
"Cocoa.framework",
}
@@ -656,7 +656,7 @@ project "shaderc"
"psapi",
}
configuration { "osx or linux*" }
configuration { "osx* or linux*" }
links {
"pthread",
}

2
scripts/texturec.lua
View File

@@ -31,7 +31,7 @@ project "texturec"
"psapi",
}
configuration { "osx" }
configuration { "osx*" }
links {
"Cocoa.framework",
}

4
scripts/texturev.lua
View File

@@ -52,7 +52,7 @@ project ("texturev")
"Xcursor",
}
configuration { "osx" }
configuration { "osx*" }
linkoptions {
"-framework CoreVideo",
"-framework IOKit",
@@ -138,7 +138,7 @@ project ("texturev")
"pthread",
}
configuration { "osx" }
configuration { "osx*" }
linkoptions {
"-framework Cocoa",
"-framework Metal",