From b91fe0c2ac2b377658187ffcf8ba829d721c98bd Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 16 Apr 2015 20:52:47 -0400 Subject: [PATCH] Some more makefile fixups. --- GNUmakefile | 1 + darwin/GNUmakeinc.mk | 2 +- unix/GNUmakeinc.mk | 2 +- windows/GNUmakeinc.mk | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 457efe40..df9d37e8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,7 @@ # 15 april 2015 OBJDIR = .obj +OUTBASE = new # MAME does this so :/ ifeq ($(OS),Windows_NT) diff --git a/darwin/GNUmakeinc.mk b/darwin/GNUmakeinc.mk index 22ca1e3e..a6afd997 100644 --- a/darwin/GNUmakeinc.mk +++ b/darwin/GNUmakeinc.mk @@ -16,4 +16,4 @@ OSMFILES = \ xCFLAGS += -mmacosx-version-min=10.7 -DMACOSX_DEPLOYMENT_TARGET=10.7 xLDFLAGS += -mmacosx-version-min=10.7 -lobjc -framework Foundation -framework AppKit -OUT = new +OUT = $(OUTBASE) diff --git a/unix/GNUmakeinc.mk b/unix/GNUmakeinc.mk index 4f707b3d..504b7da8 100644 --- a/unix/GNUmakeinc.mk +++ b/unix/GNUmakeinc.mk @@ -15,4 +15,4 @@ OSCFILES = \ xCFLAGS += `pkg-config --cflags gtk+-3.0` xLDFLAGS += `pkg-config --libs gtk+-3.0` -OUT = new +OUT = $(OUTBASE) diff --git a/windows/GNUmakeinc.mk b/windows/GNUmakeinc.mk index 494b8e37..4985cb2f 100644 --- a/windows/GNUmakeinc.mk +++ b/windows/GNUmakeinc.mk @@ -18,7 +18,7 @@ OSCFILES = \ xLDFLAGS += \ -luser32 -lkernel32 -lgdi32 -luxtheme -lmsimg32 -lcomdlg32 -lole32 -loleaut32 -loleacc -luuid -OUT = new.exe +OUT = $(OUTBASE).exe ifeq ($(ARCH),64) CC = x86_64-w64-mingw32-gcc