Previous 199869 Revisions Next

r37188 Wednesday 15th April, 2015 at 07:39:43 UTC by Miodrag Milanović
better fix for windres (nw)
[/trunk]makefile

trunk/makefile
r245699r245700
174174
175175ifeq ($(OS),windows)
176176TARGETOS := windows
177WINDRES := windres
178177ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
179178ARCHITECTURE := _x64
180179endif
r245699r245700
186185endif
187186endif
188187else
189WINDRES  := x86_64-w64-mingw32-windres
190188UNAME    := $(shell uname -mps)
191189TARGETOS := $(OS)
192190
r245699r245700
215213endif
216214endif
217215
216ifeq ($(OS),windows)
217ifeq ($(ARCHITECTURE),_x64)
218WINDRES  := $(MINGW64)/bin/windres
219else
220WINDRES  := $(MINGW32)/bin/windres
221endif
222else
223ifeq ($(ARCHITECTURE),_x64)
224WINDRES  := x86_64-w64-mingw32-windres
225else
226WINDRES  := i686-w64-mingw32-windres
227endif
228endif
218229
219230ifeq ($(findstring arm,$(UNAME)),arm)
220231ifndef NOASM
r245699r245700
650661
651662.PHONY: windows_x64
652663windows_x64: generate $(PROJECTDIR)/gmake-mingw64-gcc/Makefile
653   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(MINGW64)/bin/$(WINDRES)
664   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw64-gcc config=$(CONFIG)64 WINDRES=$(WINDRES)
654665
655666#-------------------------------------------------
656667# gmake-mingw32-gcc
r245699r245700
667678
668679.PHONY: windows_x86
669680windows_x86: generate $(PROJECTDIR)/gmake-mingw32-gcc/Makefile
670   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(MINGW32)/bin/$(WINDRES)
681   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw32-gcc config=$(CONFIG)32 WINDRES=$(WINDRES)
671682
672683#-------------------------------------------------
673684# gmake-mingw-clang
r245699r245700
681692
682693.PHONY: windows_x64_clang
683694windows_x64_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
684   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(MINGW64)/bin/$(WINDRES)
695   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)64 WINDRES=$(WINDRES)
685696
686697.PHONY: windows_x86_clang
687698windows_x86_clang: generate $(PROJECTDIR)/gmake-mingw-clang/Makefile
688   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(MINGW32)/bin/$(WINDRES)
699   $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/gmake-mingw-clang config=$(CONFIG)32 WINDRES=$(WINDRES)
689700
690701vs2010: generate
691702   $(SILENT) $(GENIE) $(PARAMS) vs2010


Previous 199869 Revisions Next


© 1997-2024 The MAME Team