From f69a8719c4dd6f1cb0c2e5d97cb238ee3c73cbb7 Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Mon, 14 Jan 2013 13:32:24 +0200 Subject: [PATCH] Fix compiling with gambatte and/or bsnes missing --- src/emulation/bsnes-legacy/Makefile | 10 +++++++--- src/emulation/gambatte/Makefile | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/emulation/bsnes-legacy/Makefile b/src/emulation/bsnes-legacy/Makefile index c3dc3ca9..aab75793 100644 --- a/src/emulation/bsnes-legacy/Makefile +++ b/src/emulation/bsnes-legacy/Makefile @@ -23,9 +23,6 @@ else BSNES_TARGET_STRING=ui=ui-libsnes endif CFLAGS += -DBSNES_V${BSNES_VERSION} -else -OBJECTS=dummy.$(OBJECT_SUFFIX) -endif BSNES_LIBRARY=bsnes/out/libsnes.$(ARCHIVE_SUFFIX) @@ -51,6 +48,13 @@ regions.inc: regions.def ../make-regions.lua %.$(OBJECT_SUFFIX): %.cpp ports.inc slots.inc regions.inc $(REALCC) -c -o $@ $< -I../../../include -I../../../bsnes $(CFLAGS) $(BSNES_CFLAGS) +else + +__all__.$(OBJECT_SUFFIX): dummy.cpp + $(REALCC) -c -o $@ $< $(CFLAGS) + echo >__all__.ldflags + +endif forcelook: @true diff --git a/src/emulation/gambatte/Makefile b/src/emulation/gambatte/Makefile index 91091c99..959adf5f 100644 --- a/src/emulation/gambatte/Makefile +++ b/src/emulation/gambatte/Makefile @@ -2,9 +2,6 @@ ifdef BUILD_GAMBATTE OBJECTS=core.$(OBJECT_SUFFIX) GAMBATTE_CFLAGS= GAMBATTE_LDFLAGS= -else -OBJECTS=dummy.$(OBJECT_SUFFIX) -endif GAMBATTE_LIBRARY=gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX) @@ -30,6 +27,14 @@ regions.inc: regions.def ../make-regions.lua %.$(OBJECT_SUFFIX): %.cpp ports.inc slots.inc regions.inc $(REALCC) -c -o $@ $< -I../../../include -I../../../gambatte $(CFLAGS) $(GAMBATTE_CFLAGS) +else + +__all__.$(OBJECT_SUFFIX): dummy.cpp + $(REALCC) -c -o $@ $< $(CFLAGS) + echo >__all__.ldflags + +endif + forcelook: @true