Commit Graph

79 Commits

Author SHA1 Message Date
Patrick Mackinlay e745009c30 genie: disable command line string escaping, fixes #13150 2025-01-02 13:26:11 +07:00
Patrick Mackinlay dc8ba812c1
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.
2024-11-27 04:39:05 +11:00
Julian Sikorski 1a5ac25f61 Sync with GENie upstream revision ce9f3c5 (#6262)
* Change makerules to take variable $(PROJECT_TYPE) instead of hardcoded 'gmake'

This allows to run `make projgen PROJECT_TYPE=ninja` to generate ninja build files instead.
and to build GENie using ninja by running `make release PROJECT_TYPE=ninja`.

Using ninja improves build times,
e.g. for macOS: 12.47s with gmake goes down to 2.05s with ninja.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Set prefer project set as solution.startproject as default target

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Adding `GenerateMapFiles` flag.

Causes Visual Studio's linker to generate .map files for that
configuration.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Add ninja support for 'wholearchive' libraries

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Fixup ninja.esc to gracefully ignore nil passed as value

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Use -Wl,-force_load for wholearchive libs when building for macosx

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Updated README.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Add space after filename in 'Generating' message

This makes the filename 'clickable' to open in iTerm and VSCode

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Print generated filenames as quoted string

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Remove '...' after filename

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Pop cwd after pushing to run file

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Make paths in embed.lua rely on script dir

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Updated README.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Fix issues caused by make-4.3 no longer adding spaces to variables in some cases The fix was found by @asavah.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Fixed release script.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Updated README.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Update scripts.c

Co-authored-by: Christian Helmich <kagekirin@gmail.com>
Co-authored-by: Johan Sköld <johan@skold.cc>
Co-authored-by: Бранимир Караџић <branimirkaradzic@gmail.com>
2020-02-06 12:49:15 +11:00
Robert b48efcdac6
Revert "Sync with GENie upstream revision ce9f3c5 (#6262)" (#6263)
This reverts commit a06d8e9cc6.
2020-02-06 10:02:41 +11:00
Julian Sikorski a06d8e9cc6
Sync with GENie upstream revision ce9f3c5 (#6262)
* Change makerules to take variable $(PROJECT_TYPE) instead of hardcoded 'gmake'

This allows to run `make projgen PROJECT_TYPE=ninja` to generate ninja build files instead.
and to build GENie using ninja by running `make release PROJECT_TYPE=ninja`.

Using ninja improves build times,
e.g. for macOS: 12.47s with gmake goes down to 2.05s with ninja.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Set prefer project set as solution.startproject as default target

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Adding `GenerateMapFiles` flag.

Causes Visual Studio's linker to generate .map files for that
configuration.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Add ninja support for 'wholearchive' libraries

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Fixup ninja.esc to gracefully ignore nil passed as value

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Use -Wl,-force_load for wholearchive libs when building for macosx

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Updated README.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Add space after filename in 'Generating' message

This makes the filename 'clickable' to open in iTerm and VSCode

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Print generated filenames as quoted string

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Remove '...' after filename

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Pop cwd after pushing to run file

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Make paths in embed.lua rely on script dir

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Updated README.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Fix issues caused by make-4.3 no longer adding spaces to variables in some cases The fix was found by @asavah.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Fixed release script.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Updated README.

Signed-off-by: Julian Sikorski <belegdol+github@gmail.com>

* Update scripts.c

Co-authored-by: Christian Helmich <kagekirin@gmail.com>
Co-authored-by: Johan Sköld <johan@skold.cc>
Co-authored-by: Бранимир Караџић <branimirkaradzic@gmail.com>
2020-02-05 17:21:10 -05:00
smf- bca6bf52c0 really disable _MAKE.escquote() so the defines in expat.make match the previous version (nw) 2019-09-30 11:08:36 +01:00
Julian Sikorski ed2b7e5ef1 Synced with GENie upstream revision e78d6c1 (#5631)
* Synced with GENie upstream revision e78d6c1

* Add Visual Studio 2019 support

* Fix hardcoded -m64

* Switch appveyor to Visual Studio 2019

* Fix genie being built as 32-bit

* MSVC build is known to be broken currently. Let it fail until all the known issues are fixed.

* Update the packages before building

* Build with 3 threads
Appveyor VMs have only 2 cores and 8 GB RAM.

* Enable caching of pacman cache
2019-09-29 09:30:18 -04:00
Vas Crabb 97b6717027 (nw) Clean up the mess on master
This effectively reverts b380514764 and
c24473ddff, restoring the state at
598cd52272.

Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline.  When things like this happen, it wastes
everyone's time.  I really don't need this in a week when real work™ is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
2019-03-26 11:13:37 +11:00
andreasnaive b380514764 Revert "conflict resolution (nw)"
This reverts commit c24473ddff, reversing
changes made to 009cba4fb8.
2019-03-25 23:13:40 +01:00
Peter Ferrie e769e76ce4 enable sub-second snapshot timers (nw) (#4493)
* enable sub-second snapshot timers (nw)

* switch to attotime, accept doubles

* support LLVM extension in MSVC

make vsllvm

using extension from here:

https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain
2019-02-04 13:05:46 -05:00
smf- 444861f487 fixed typo (nw) 2018-08-29 15:33:55 +01:00
smf- c10977e7d5 default to 64 bit microsoft compiler (nw) 2018-08-29 10:21:35 +01:00
smf- cff76a60a0 workround so you can still compile if you install the 15.8 update, as long as you install the 14.14.26428 compiler as well (nw) 2018-08-26 20:41:11 +01:00
Miodrag Milanovic 3917627494 Updated GENie, BGFX, BX, added BIMG since it is separated now, updated all shader binaries and MAME part of code to support new interfaces [Miodrag Milanovic] 2017-12-01 13:22:27 +01:00
Miodrag Milanovic 13b0a2158e Fix linking order (nw) 2017-04-01 19:07:50 +02:00
Branimir Karadžić 88ca8d5b48 Update GENie (nw) 2017-03-29 17:31:27 +02:00
Branimir Karadžić 193e8c8a89 Update GENie 2017-02-05 13:54:19 +01:00
Branimir Karadžić a642e29ecd Update GENie (nw) 2017-01-02 14:03:29 +01:00
Miodrag Milanovic e5678fd689 you can't change just generated script (nw) 2016-11-19 09:48:03 +01:00
Vas Crabb c5722bca13 Fix make VERBOSE=1 not showing archive commands for static libraries [Happy]
someone send this upstream for me (nw)
2016-11-19 08:06:04 +11:00
Miodrag Milanovic da1c0c867b generate proper SLN header (nw) 2016-11-16 21:21:12 +01:00
Miodrag Milanovic ffc04d2bae Sync with GENie and addition of VS2017 (nw) 2016-11-16 21:00:28 +01:00
Miodrag Milanovic 330e3cb28e Finally sync with GENie, no more local changes (nw) 2016-11-03 10:04:29 +01:00
Miodrag Milanovic 9b819d1302 Patches to keep same behavior as we had before (nw) 2016-11-02 08:41:58 +01:00
Miodrag Milanovic 6c390127c2 Update to latest GENie (nw) 2016-11-02 08:36:07 +01:00
Jordi Mallach 70f0bda9c7 Detect GNU/Hurd systems, but treat them as Linux. 2016-07-26 01:34:49 +02:00
Miodrag Milanovic deac5db4db put back some genie code (nw) 2016-06-16 14:45:28 +02:00
Miodrag Milanovic 4a7cd83c6e Sync GENie, one thing changed, and I have revoked one patch that is going to be removed or changed anyway (nw) 2016-06-10 18:54:55 +02:00
Miodrag Milanovic 3547905acc Synced GENie with latest and applied few changes sent as PR (nw) 2016-06-10 10:56:31 +02:00
Miodrag Milanovic e8cb3e06d0 Updated GENie to latest (nw) 2016-06-08 20:42:23 +02:00
Branimir Karadžić f97b68d3ed Update GENie, BGFX and BX (nw) 2016-05-03 12:20:29 +02:00
Miodrag Milanovic 0edd2cd1be Updated genie left our local changes (nw) 2016-04-27 18:09:08 +02:00
Miodrag Milanovic 79bfc4b153 Make support for absolute paths for debug dir (nw) 2016-04-12 16:14:02 +02:00
Brad Hughes 37935d5eb6 GENie cl.exe multiprocessor build fix. 2016-04-05 13:39:50 -04:00
Miodrag Milanovic 5c34b1ba40 Update GENie (nw) 2016-03-31 20:37:28 +02:00
Branimir Karadžić cb04dd4bae Updated GENie to latest (nw) 2016-03-21 12:16:30 +01:00
Miodrag Milanovic 9d4c8c5de5 Made xcode params more generic (nw) 2016-02-26 20:30:37 +01:00
Miodrag Milanovic 8dff2200d0 And I hate you too XCode (nw) 2016-02-22 21:11:57 +01:00
Miodrag Milanovic 412814f80d changes towards compiling with XCode (nw) 2016-02-21 19:48:16 +01:00
Miodrag Milanovic 71bb70d968 Fixed solutionVersion for VS2015 and ToolsVersion for all VS201x
This fixes IncrediBuild under VS2015
2016-01-05 20:35:28 +01:00
Miodrag Milanovic 842519672e Synced with latest GENie, our specific code is not overwritten (nw) 2016-01-03 16:55:52 +01:00
Miodrag Milanovic f1a0a3cb88 Added pre-compiled headers support to build system (nw) 2016-01-01 08:23:58 +01:00
AJR 8567ac0d64 Allow SDLMAME to build on OS X from paths containing spaces 2015-12-19 11:09:57 -05:00
arbee fee2af52af Updated OS/2 support [KO Myung-Hun] 2015-11-23 21:24:58 -05:00
Miodrag Milanovic 225a99c0f6 Add definitions to cmake target (nw) 2015-11-15 15:14:55 +01:00
Miodrag Milanovic 033227778e Remove not longer needed ForceCpp flag (nw) 2015-11-08 13:44:34 +01:00
Miodrag Milanovic 57e64c5603 Fix genie issue (nw) 2015-10-16 07:43:07 +02:00
Miodrag Milanovic f45715a420 Update to latest Genie (nw)
KO Myung-Hun: please send your patches upstream first always.
2015-10-15 11:21:28 +02:00
Vas Crabb f500420346 OS/2 patch for 0.164 [KO Myung-Hun] 2015-08-25 13:02:01 +10:00
Miodrag Milanovic 08bfa598df Update GENie (nw) 2015-05-27 12:06:10 +02:00