diff options
author | 2015-10-20 21:34:36 +0200 | |
---|---|---|
committer | 2015-10-20 21:34:36 +0200 | |
commit | a7b8acbe3eebcf17367baa642375cfa47ae4ea85 (patch) | |
tree | 854b859d6176802c0278f4b00de3f7c774e02dda /3rdparty/bgfx/scripts/example-common.lua | |
parent | 4610935e796661874bb4ee7ec6536d9423aeb7be (diff) | |
parent | 74aae76c4e3e257f99d139c4febb5d86d1419e50 (diff) |
Merge pull request #6 from mamedev/master
Sync to base master
Diffstat (limited to '3rdparty/bgfx/scripts/example-common.lua')
-rw-r--r-- | 3rdparty/bgfx/scripts/example-common.lua | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/3rdparty/bgfx/scripts/example-common.lua b/3rdparty/bgfx/scripts/example-common.lua index 37e53afaa83..98dad9afc31 100644 --- a/3rdparty/bgfx/scripts/example-common.lua +++ b/3rdparty/bgfx/scripts/example-common.lua @@ -22,6 +22,30 @@ project ("example-common") path.join(BGFX_DIR, "examples/common/**.h"), } + if _OPTIONS["with-scintilla"] then + defines { + "SCI_NAMESPACE", + "SCI_LEXER", + } + + buildoptions { +-- "-Wno-missing-field-initializers", + } + + includedirs { + path.join(BGFX_DIR, "3rdparty/scintilla/include"), + path.join(BGFX_DIR, "3rdparty/scintilla/lexlib"), + } + + files { + path.join(BGFX_DIR, "3rdparty/scintilla/src/**.cxx"), + path.join(BGFX_DIR, "3rdparty/scintilla/src/**.h"), + path.join(BGFX_DIR, "3rdparty/scintilla/lexlib/**.cxx"), + path.join(BGFX_DIR, "3rdparty/scintilla/lexlib/**.h"), + path.join(BGFX_DIR, "3rdparty/scintilla/lexers/**.cxx"), + } + end + if _OPTIONS["with-sdl"] then defines { "ENTRY_CONFIG_USE_SDL=1", @@ -37,16 +61,10 @@ project ("example-common") } end - configuration { "vs2008" } - includedirs { - "$(DXSDK_DIR)/include", + configuration { "osx or ios* or tvos*" } + files { + path.join(BGFX_DIR, "examples/common/**.mm"), } - if (_OPTIONS["vs"] == "vs2012-xp") or (_OPTIONS["vs"] == "vs2013-xp") then - configuration { "vs201*" } - includedirs { - "$(DXSDK_DIR)/include", - } - end configuration { "winphone8* or winstore8*"} linkoptions { |