From 08747b36ecb01d5d77e33908372ac132fdd61453 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 16 Apr 2015 13:44:11 +0200 Subject: test for linking (nw) --- scripts/genie.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index 090ac21fe95..7d83f319a0b 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1,6 +1,5 @@ premake.check_paths = true premake.make.override = { "TARGET" } -premake.make.linkoptions_after = true MAME_DIR = (path.getabsolute("..") .. "/") local MAME_BUILD_DIR = (MAME_DIR .. "build/") local naclToolchain = "" -- cgit v1.2.3-70-g09d2 From 119d23192b25b1fc71af7d4b0dc2c118c698a0ea Mon Sep 17 00:00:00 2001 From: couriersud Date: Thu, 16 Apr 2015 23:44:30 +0200 Subject: Fix OPENMP linking. (nw) --- scripts/genie.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index 7d83f319a0b..e544f318075 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -746,6 +746,9 @@ if _OPTIONS["OPENMP"]=="1" then buildoptions { "-fopenmp", } + linkoptions { + "-fopenmp" + } else buildoptions { "-Wno-unknown-pragmas", @@ -753,9 +756,9 @@ else end if _OPTIONS["LDOPTS"] then - linkoptions { - _OPTIONS["LDOPTS"] - } + linkoptions { + _OPTIONS["LDOPTS"] + } end if _OPTIONS["MAP"] then -- cgit v1.2.3-70-g09d2 From 0d60fe780559dca91448a4917a8b9ec026368c8b Mon Sep 17 00:00:00 2001 From: couriersud Date: Fri, 17 Apr 2015 18:05:01 +0200 Subject: Make sure USE_OPENMP is passed via define. (nw) --- scripts/genie.lua | 4 ++++ src/emu/netlist/nl_config.h | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index e544f318075..b5619c41f50 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -749,6 +749,10 @@ if _OPTIONS["OPENMP"]=="1" then linkoptions { "-fopenmp" } + defines { + "USE_OPENMP=1", + } + else buildoptions { "-Wno-unknown-pragmas", diff --git a/src/emu/netlist/nl_config.h b/src/emu/netlist/nl_config.h index f16eca5add4..f392bfb577c 100644 --- a/src/emu/netlist/nl_config.h +++ b/src/emu/netlist/nl_config.h @@ -40,11 +40,7 @@ // The following adds about 10% performance ... #if !defined(USE_OPENMP) -#if defined(_OPENMP) -#define USE_OPENMP (1) -#else // defined(_OPENMP) #define USE_OPENMP (0) -#endif // defined(_OPENMP) #endif // !defined(USE_OPENMP) // Use nano-second resolution - Sufficient for now @@ -248,7 +244,7 @@ __extension__ typedef signed long long INT64; #if (USE_OPENMP) #if (!(HAS_OPENMP)) -#warning To use openmp compile and link with "-fopenmp" +#error To use openmp compile and link with "-fopenmp" #endif #endif -- cgit v1.2.3-70-g09d2 From f56db1ff3fc73037fc900bfee9cebe80cc63afeb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 18 Apr 2015 12:51:33 +0200 Subject: fixed android compile (nw) --- scripts/genie.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index b5619c41f50..597dca93f26 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -906,6 +906,9 @@ configuration { "asmjs" } archivesplit_size "20" configuration { "android*" } + buildoptions { + "-Wno-undef", + } buildoptions_cpp { "-x c++", "-std=gnu++98", -- cgit v1.2.3-70-g09d2 From 073fd3f7d41580b08729f0a009066b149c535e54 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 19 Apr 2015 16:21:36 +0200 Subject: Added NO_STRIPPING option and enabled stripping of executable by default (nw) --- makefile | 5 +++++ scripts/genie.lua | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'scripts/genie.lua') diff --git a/makefile b/makefile index 2e6c5d9f89d..46211bae89b 100644 --- a/makefile +++ b/makefile @@ -77,6 +77,7 @@ # SEPARATE_BIN = 1 # PYTHON_EXECUTABLE = python3 # SHADOW_CHECK = 1 +# NO_STRIPPING = 1 # QT_HOME = /usr/lib64/qt48/ @@ -538,6 +539,10 @@ ifdef SHADOW_CHECK PARAMS += --SHADOW_CHECK='$(SHADOW_CHECK)' endif +ifdef NO_STRIPPING +PARAMS += --NO_STRIPPING='$(NO_STRIPPING)' +endif + ifdef QT_HOME PARAMS += --QT_HOME='$(QT_HOME)' endif diff --git a/scripts/genie.lua b/scripts/genie.lua index 597dca93f26..019b4486c0c 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -287,6 +287,15 @@ newoption { } } +newoption { + trigger = "NO_STRIPPING", + description = "Stripping.", + allowed = { + { "0", "Enabled" }, + { "1", "Disabled" }, + } +} + PYTHON = "python" @@ -1139,11 +1148,12 @@ else end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) +if (_OPTIONS["NO_STRIPPING"]~="1") then + strip() +end + if _OPTIONS["with-tools"] then group "tools" dofile(path.join("src", "tools.lua")) end -if (_ACTION == "gmake" and _OPTIONS["gcc"]=='asmjs') then - strip() -end -- cgit v1.2.3-70-g09d2 From 3827f898ab9e2693ba3d85a585928987f5566c86 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 22 Apr 2015 14:23:49 +0200 Subject: Renamed to STRIP_SYMBOLS and made logic more clear (nw) --- makefile | 6 +++--- scripts/genie.lua | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/genie.lua') diff --git a/makefile b/makefile index 46211bae89b..eb2e33f4ef5 100644 --- a/makefile +++ b/makefile @@ -77,7 +77,7 @@ # SEPARATE_BIN = 1 # PYTHON_EXECUTABLE = python3 # SHADOW_CHECK = 1 -# NO_STRIPPING = 1 +# STRIP_SYMBOLS = 0 # QT_HOME = /usr/lib64/qt48/ @@ -539,8 +539,8 @@ ifdef SHADOW_CHECK PARAMS += --SHADOW_CHECK='$(SHADOW_CHECK)' endif -ifdef NO_STRIPPING -PARAMS += --NO_STRIPPING='$(NO_STRIPPING)' +ifdef STRIP_SYMBOLS +PARAMS += --STRIP_SYMBOLS='$(STRIP_SYMBOLS)' endif ifdef QT_HOME diff --git a/scripts/genie.lua b/scripts/genie.lua index 019b4486c0c..37bd81c12df 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -288,11 +288,11 @@ newoption { } newoption { - trigger = "NO_STRIPPING", - description = "Stripping.", + trigger = "STRIP_SYMBOLS", + description = "Symbols stripping.", allowed = { - { "0", "Enabled" }, - { "1", "Disabled" }, + { "0", "Disabled" }, + { "1", "Enabled" }, } } @@ -1148,7 +1148,7 @@ else end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) -if (_OPTIONS["NO_STRIPPING"]~="1") then +if (_OPTIONS["STRIP_SYMBOLS"]== nil or _OPTIONS["STRIP_SYMBOLS"]=="1") then strip() end -- cgit v1.2.3-70-g09d2 From 45d4aed8b77cf6cf7b1f714192b69564714bd012 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 22 Apr 2015 14:24:41 +0200 Subject: do not strip by default --- scripts/genie.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index 37bd81c12df..ddb651bb4b1 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1148,7 +1148,7 @@ else end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) -if (_OPTIONS["STRIP_SYMBOLS"]== nil or _OPTIONS["STRIP_SYMBOLS"]=="1") then +if (_OPTIONS["STRIP_SYMBOLS"]=="1") then strip() end -- cgit v1.2.3-70-g09d2 From 3a37417a6ba315f237c2db958e337a8493def5eb Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 25 Apr 2015 13:02:38 +0200 Subject: use target suffixes only for main executable (nw) --- scripts/genie.lua | 38 -------------------------------------- scripts/src/main.lua | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 38 deletions(-) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index ddb651bb4b1..032e66409c7 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -428,44 +428,6 @@ configuration { "gmake" } "SingleOutputDir", } -configuration { "x64", "Release" } - targetsuffix "64" - if _OPTIONS["PROFILE"] then - targetsuffix "64p" - end - -configuration { "x64", "Debug" } - targetsuffix "64d" - if _OPTIONS["PROFILE"] then - targetsuffix "64dp" - end - -configuration { "x32", "Release" } - targetsuffix "" - if _OPTIONS["PROFILE"] then - targetsuffix "p" - end - -configuration { "x32", "Debug" } - targetsuffix "d" - if _OPTIONS["PROFILE"] then - targetsuffix "dp" - end - -configuration { "Native", "Release" } - targetsuffix "" - if _OPTIONS["PROFILE"] then - targetsuffix "p" - end - -configuration { "Native", "Debug" } - targetsuffix "d" - if _OPTIONS["PROFILE"] then - targetsuffix "dp" - end - -configuration { } - dofile ("toolchain.lua") diff --git a/scripts/src/main.lua b/scripts/src/main.lua index a109bea87dd..80e3d1bf09a 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -28,6 +28,42 @@ function mainProject(_target, _subtarget) "Unicode", } + configuration { "x64", "Release" } + targetsuffix "64" + if _OPTIONS["PROFILE"] then + targetsuffix "64p" + end + + configuration { "x64", "Debug" } + targetsuffix "64d" + if _OPTIONS["PROFILE"] then + targetsuffix "64dp" + end + + configuration { "x32", "Release" } + targetsuffix "" + if _OPTIONS["PROFILE"] then + targetsuffix "p" + end + + configuration { "x32", "Debug" } + targetsuffix "d" + if _OPTIONS["PROFILE"] then + targetsuffix "dp" + end + + configuration { "Native", "Release" } + targetsuffix "" + if _OPTIONS["PROFILE"] then + targetsuffix "p" + end + + configuration { "Native", "Debug" } + targetsuffix "d" + if _OPTIONS["PROFILE"] then + targetsuffix "dp" + end + configuration { "mingw*" or "vs*" } targetextension ".exe" -- cgit v1.2.3-70-g09d2 From d33822a35c76722a29e59d7f387c7966250ece68 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 30 Apr 2015 13:20:36 +0200 Subject: ssues with white-space in MAME_DIR [qmc2] --- scripts/genie.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/genie.lua') diff --git a/scripts/genie.lua b/scripts/genie.lua index 032e66409c7..42ff7fc64ce 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1,6 +1,7 @@ premake.check_paths = true premake.make.override = { "TARGET" } MAME_DIR = (path.getabsolute("..") .. "/") +MAME_DIR = string.gsub(MAME_DIR, "(%s)", "\\%1") local MAME_BUILD_DIR = (MAME_DIR .. "build/") local naclToolchain = "" -- cgit v1.2.3-70-g09d2