Skip to content

Commit dc8ba81

Browse files
pmackinlaypmackinlay
authored
Updated GENie and changed Visual Studio target to Visual Studio 2022. (#13000)
* Updated to GENie 1181. * Applied local fix for GENie resource include directory bug, sent upstream as bkaradzic/GENie#572. * Set MSVC flags to use conformant preprocessor, standards conformance mode, and assume UTF-8 encoding.
1 parent 5b1adf3 commit dc8ba81

64 files changed

Lines changed: 1743 additions & 2705 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎3rdparty/bgfx/src/shader_spirv.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace bgfx
1717
#define SPV_OPERAND_7(_a0, _a1, _a2, _a3, _a4, _a5, _a6) SPV_OPERAND_1(_a0), SPV_OPERAND_6(_a1, _a2, _a3, _a4, _a5, _a6)
1818
#define SPV_OPERAND_8(_a0, _a1, _a2, _a3, _a4, _a5, _a6, _a7) SPV_OPERAND_1(_a0), SPV_OPERAND_7(_a1, _a2, _a3, _a4, _a5, _a6, _a7)
1919
#define SPV_OPERAND_9(_a0, _a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8) SPV_OPERAND_1(_a0), SPV_OPERAND_8(_a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8)
20-
#if BX_COMPILER_MSVC
20+
#if BX_COMPILER_MSVC && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL)
2121
// Workaround MSVS bug...
2222
# define SPV_OPERAND(...) { BX_MACRO_DISPATCHER(SPV_OPERAND_, __VA_ARGS__) BX_VA_ARGS_PASS(__VA_ARGS__) }
2323
#else

‎3rdparty/bx/include/bx/macros.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define BX_MACROS_H_HEADER_GUARD
1212

1313
///
14-
#if BX_COMPILER_MSVC
14+
#if BX_COMPILER_MSVC && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL)
1515
// Workaround MSVS bug...
1616
# define BX_VA_ARGS_PASS(...) BX_VA_ARGS_PASS_1_ __VA_ARGS__ BX_VA_ARGS_PASS_2_
1717
# define BX_VA_ARGS_PASS_1_ (
@@ -145,7 +145,7 @@
145145
#define BX_UNUSED_11(_a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8, _a9, _a10, _a11) BX_UNUSED_10(_a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8, _a9, _a10); BX_UNUSED_1(_a11)
146146
#define BX_UNUSED_12(_a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8, _a9, _a10, _a11, _a12) BX_UNUSED_11(_a1, _a2, _a3, _a4, _a5, _a6, _a7, _a8, _a9, _a10, _a11); BX_UNUSED_1(_a12)
147147

148-
#if BX_COMPILER_MSVC
148+
#if BX_COMPILER_MSVC && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL)
149149
// Workaround MSVS bug...
150150
# define BX_UNUSED(...) BX_MACRO_DISPATCHER(BX_UNUSED_, __VA_ARGS__) BX_VA_ARGS_PASS(__VA_ARGS__)
151151
#else
@@ -226,7 +226,7 @@
226226
#define BX_CLASS_3(_class, _a1, _a2, _a3) BX_CLASS_2(_class, _a1, _a2); BX_CLASS_1(_class, _a3)
227227
#define BX_CLASS_4(_class, _a1, _a2, _a3, _a4) BX_CLASS_3(_class, _a1, _a2, _a3); BX_CLASS_1(_class, _a4)
228228

229-
#if BX_COMPILER_MSVC
229+
#if BX_COMPILER_MSVC && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL)
230230
# define BX_CLASS(_class, ...) BX_MACRO_DISPATCHER(BX_CLASS_, __VA_ARGS__) BX_VA_ARGS_PASS(_class, __VA_ARGS__)
231231
#else
232232
# define BX_CLASS(_class, ...) BX_MACRO_DISPATCHER(BX_CLASS_, __VA_ARGS__)(_class, __VA_ARGS__)

‎3rdparty/genie/.travis.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎3rdparty/genie/README.md‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
<p align="center">
2+
<img src="https://repository-images.githubusercontent.com/23779242/961ad700-8d21-11ea-85d3-1d64eccc4531" width="1280">
3+
</p>
4+
15
[GENie](https://github.com/bkaradzic/genie#what-is-it) - Project generator tool
26
===============================================================================
37

8+
[![Build and Upload Artifact](https://github.com/bkaradzic/GENie/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/bkaradzic/GENie/actions/workflows/build.yml)
9+
410
What is it?
511
-----------
612

@@ -9,19 +15,16 @@ generates project from Lua script, making applying the same settings for
915
multiple projects easy.
1016

1117
Supported project generators:
12-
* FASTBuild (experimental)
1318
* GNU Makefile
19+
* [JSON Compilation Database][jcdb]
1420
* Ninja (experimental)
15-
* Qbs / QtCreator (experimental)
16-
* Visual Studio 2010, 2012, 2013, 2015, 2017, 2019
21+
* Visual Studio 2010, 2012, 2013, 2015, 2017, 2019, 2022
1722
* XCode
1823

1924
Download (stable)
2025
-----------------
2126

22-
[![Build Status](https://travis-ci.org/bkaradzic/GENie.svg?branch=master)](https://travis-ci.org/bkaradzic/GENie)
23-
24-
version 1115 (commit cd9b1a624810b166d11788d01c2aa4daf2ea42e6)
27+
version 1181 (commit 29e6832fdf3b106c0906d288c8ced6c0761b8985)
2528

2629
Linux:
2730
https://github.com/bkaradzic/bx/raw/master/tools/bin/linux/genie
@@ -43,7 +46,11 @@ Documentation
4346
-------------
4447

4548
[Scripting Reference](https://github.com/bkaradzic/genie/blob/master/docs/scripting-reference.md#scripting-reference)
46-
[Introduction to GENie - CppCon 2016](https://onedrive.live.com/view.aspx?cid=171ee76e679935c8&page=view&resid=171EE76E679935C8!139573&parId=171EE76E679935C8!18835&authkey=!AKv_SGrgJwxDGDg&app=PowerPoint)
49+
50+
Introduction to GENie - CppCon 2016
51+
<a href="http://www.youtube.com/watch?feature=player_embedded&v=_vArtdDTrTM"
52+
target="_blank"><img src="http://img.youtube.com/vi/_vArtdDTrTM/0.jpg"
53+
alt="Introduction to GENie - CppCon 2016" width="640" height="480" border="0" /></a>
4754

4855
History
4956
-------
@@ -90,7 +97,7 @@ of Premake 4.4 beta 5, and there is no intention to keep it compatible with it.
9097
- Added support for generating PS4/Orbis projects.
9198
- Fixed PCH race when using concurrent Makefile build.
9299
- Added Green Hills Software compiler support.
93-
- Added edit & continue support for 64-bit builds in VS2013 upwards.
100+
- Added edit & continue support for 64-bit builds in vs2013 upwards.
94101
- Added `windowstargetplatformversion` to specify VS Windows target version.
95102
- Added `NoWinRT` flag to disable WinRT CX builds.
96103
- Added `NoBufferSecurityCheck` flag to disable security checks in VS.
@@ -120,17 +127,23 @@ of Premake 4.4 beta 5, and there is no intention to keep it compatible with it.
120127
- Added `iostargetplatformversion`, `macostargetplatformversion`, and
121128
`tvostargetplatformversion` to specify XCode OS target version.
122129
- Removed the `xcode3`, and `xcode4` actions.
123-
- Added the `xcode8`, `xcode9`, and `xcode10` actions.
130+
- Added the `xcode8`, `xcode9`, `xcode10`, `xcode11` and `xcode14` actions.
124131
- Added `systemincludedirs` that are always searched after directories added
125132
using `includedirs`.
126133
- Added `NoRuntimeChecks` flag to disable Basic Runtime Checks in non-optimized
127134
Visual Studio builds.
128135
- Added support for Nintendo Switch projects.
129-
- Added flags for selecting C++ standard: `Cpp11`, `Cpp14`, `Cpp17`,
136+
- Added flags for selecting C++ standard: `Cpp11`, `Cpp14`, `Cpp17`, `Cpp20`
130137
and `CppLatest`.
131138
- Added `xcodeprojectopts` and `xcodetargetopts`.
132139
- Added vs2019 support.
133-
- Added UnitySupport flag to enable Unity (Jumbo) builds in Visual Studio 2019
140+
- Added `UnitySupport` flag to enable Unity (Jumbo) builds in vs2019
141+
- Added the `jcdb` action for generating a [JSON compilation database][jcdb].
142+
- Added support for generating Switch/NX32 Switch/NX64 projects.
143+
- Removed FASTBuild.
144+
- Removed Qbs support.
145+
- Added vs2022 support.
146+
- Added xcode15 action with visionOS support.
134147

135148
build - GENie build system scripts
136149
----------------------------------
@@ -240,4 +253,5 @@ Developer Crackshell used GENie for development of games
240253
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
241254
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
242255

256+
[jcdb]: https://clang.llvm.org/docs/JSONCompilationDatabase.html
243257
[zbs]: https://studio.zerobrane.com

‎3rdparty/genie/build/gmake.darwin/genie.make‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# GNU Make project makefile autogenerated by GENie
2+
3+
.SUFFIXES:
4+
25
ifndef config
36
config=release
47
endif
@@ -49,11 +52,11 @@ ifeq ($(config),release)
4952
DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_MACOSX
5053
INCLUDES += -I"../../src/host/lua-5.3.0/src"
5154
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
52-
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -mmacosx-version-min=10.6
53-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -mmacosx-version-min=10.6
54-
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -mmacosx-version-min=10.6
55-
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -mmacosx-version-min=10.6
56-
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os $(MPARAM) -mmacosx-version-min=10.6
55+
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -mmacosx-version-min=10.6
56+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -mmacosx-version-min=10.6
57+
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -mmacosx-version-min=10.6
58+
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -mmacosx-version-min=10.6
59+
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -m64 -mmacosx-version-min=10.6
5760
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
5861
ALL_LDFLAGS += $(LDFLAGS) -L"." -mmacosx-version-min=10.6
5962
LIBDEPS +=
@@ -136,11 +139,11 @@ ifeq ($(config),debug)
136139
DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE -DLUA_USE_MACOSX
137140
INCLUDES += -I"../../src/host/lua-5.3.0/src"
138141
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
139-
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g $(MPARAM) -mmacosx-version-min=10.6
140-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g $(MPARAM) -mmacosx-version-min=10.6
141-
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g $(MPARAM) -mmacosx-version-min=10.6
142-
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g $(MPARAM) -mmacosx-version-min=10.6
143-
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g $(MPARAM) -mmacosx-version-min=10.6
142+
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -mmacosx-version-min=10.6
143+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -mmacosx-version-min=10.6
144+
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -mmacosx-version-min=10.6
145+
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -mmacosx-version-min=10.6
146+
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -m64 -mmacosx-version-min=10.6
144147
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
145148
ALL_LDFLAGS += $(LDFLAGS) -L"." -mmacosx-version-min=10.6
146149
LIBDEPS +=
@@ -224,11 +227,11 @@ ifeq ($(config),releaseuniv32)
224227
DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_MACOSX
225228
INCLUDES += -I"../../src/host/lua-5.3.0/src"
226229
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
227-
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
228-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
229-
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
230-
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
231-
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
230+
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
231+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
232+
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
233+
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
234+
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
232235
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
233236
ALL_LDFLAGS += $(LDFLAGS) -L"." -arch i386 -arch ppc -mmacosx-version-min=10.6
234237
LIBDEPS +=
@@ -312,11 +315,11 @@ ifeq ($(config),debuguniv32)
312315
DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE -DLUA_USE_MACOSX
313316
INCLUDES += -I"../../src/host/lua-5.3.0/src"
314317
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP -MP $(DEFINES) $(INCLUDES)
315-
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
316-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
317-
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
318-
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
319-
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc $(MPARAM) -mmacosx-version-min=10.6
318+
ALL_ASMFLAGS += $(ASMFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
319+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
320+
ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
321+
ALL_OBJCFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
322+
ALL_OBJCPPFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g -arch i386 -arch ppc -m64 -mmacosx-version-min=10.6
320323
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
321324
ALL_LDFLAGS += $(LDFLAGS) -L"." -arch i386 -arch ppc -mmacosx-version-min=10.6
322325
LIBDEPS +=

0 commit comments

Comments
 (0)