Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-09 06:13:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

better fix for windres (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-04-15 09:39:43 +02:00
parent f8a6adf13c
commit c3345bc74f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
makefile
View File

@ -174,7 +174,6 @@ ifndef TARGETOS
ifeq ($(OS),windows) ifeq ($(OS),windows)
TARGETOS := windows TARGETOS := windows
WINDRES := windres
ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
ARCHITECTURE := _x64 ARCHITECTURE := _x64
endif endif
@ -186,7 +185,6 @@ ARCHITECTURE := _x86
endif endif
endif endif
else else
WINDRES := x86_64-w64-mingw32-windres
UNAME := $(shell uname -mps) UNAME := $(shell uname -mps)
TARGETOS := $(OS) TARGETOS := $(OS)
@ -215,6 +213,19 @@ ARCHITECTURE := _x86
endif endif
endif endif
ifeq ($(OS),windows)
ifeq ($(ARCHITECTURE),_x64)
WINDRES := $(MINGW64)/bin/windres
else
WINDRES := $(MINGW32)/bin/windres
endif
else
ifeq ($(ARCHITECTURE),_x64)
WINDRES := x86_64-w64-mingw32-windres
else
WINDRES := i686-w64-mingw32-windres
endif
endif
ifeq ($(findstring arm,$(UNAME)),arm) ifeq ($(findstring arm,$(UNAME)),arm)
ifndef NOASM ifndef NOASM
@ -650,7 +661,7 @@ endif
.PHONY: windows_x64 .PHONY: windows_x64
windows_x64: generate $(PROJECTDIR)/gmake-mingw64-gcc/Makefile windows_x64: generate $(PROJECTDIR)/gmake-mingw64-gcc/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(MINGW64)/bin/$(WINDRES) $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
#------------------------------------------------- #-------------------------------------------------
# gmake-mingw32-gcc # gmake-mingw32-gcc
@ -667,7 +678,7 @@ endif
.PHONY: windows_x86 .PHONY: windows_x86
windows_x86: generate $(PROJECTDIR)/gmake-mingw32-gcc/Makefile windows_x86: generate $(PROJECTDIR)/gmake-mingw32-gcc/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(MINGW32)/bin/$(WINDRES) $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
#------------------------------------------------- #-------------------------------------------------
# gmake-mingw-clang # gmake-mingw-clang
@ -681,11 +692,11 @@ endif
.PHONY: windows_x64_clang .PHONY: windows_x64_clang
windows_x64_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile windows_x64_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(MINGW64)/bin/$(WINDRES) $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
.PHONY: windows_x86_clang .PHONY: windows_x86_clang
windows_x86_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile windows_x86_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(MINGW32)/bin/$(WINDRES) $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
vs2010: generate vs2010: generate
$(SILENT) $(GENIE) $(PARAMS) vs2010 $(SILENT) $(GENIE) $(PARAMS) vs2010