diff options
author | 2019-11-12 07:29:09 -0300 | |
---|---|---|
committer | 2019-11-12 21:43:19 +1100 | |
commit | 58dde95d078c5906a2e5e8811d6c2e86e9a1f3c1 (patch) | |
tree | cc1852e1d969253f1832f4be6da7bbe179751521 /makefile | |
parent | f47c225bd5a7cddbbb6b1c4a5020f3929184ec20 (diff) |
workaround to fix cross compilation to x86 from a x64 host
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -293,6 +293,21 @@ else UNAME := $(shell uname -mps) TARGETOS := $(OS) +#------------------------------------------------- +# determine the whether -m32, -m64 or nothing +# should be passed to gcc when building genie +#------------------------------------------------- + +ifeq ($(ARCHITECTURE),_x86) +MPARAM := -m32 +else +ifeq ($(ARCHITECTURE),_x64) +MPARAM := -m64 +else +MPARAM := +endif +endif + ARCHITECTURE := _x86 ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64) @@ -406,21 +421,6 @@ LD := $(SILENT)g++ CXX:= $(SILENT)g++ #------------------------------------------------- -# determine the whether -m32, -m64 or nothing -# should be passed to gcc when building genie -#------------------------------------------------- - -ifeq ($(ARCHITECTURE),_x86) -MPARAM := -m32 -else -ifeq ($(ARCHITECTURE),_x64) -MPARAM := -m64 -else -MPARAM := -endif -endif - -#------------------------------------------------- # specify OSD layer: windows, sdl, etc. # build scripts will be run from # scripts/src/osd/$(OSD).lua |