Fix compiling with gambatte and/or bsnes missing
This commit is contained in:
parent
87fbffffd7
commit
f69a8719c4
2 changed files with 15 additions and 6 deletions
|
@ -23,9 +23,6 @@ else
|
||||||
BSNES_TARGET_STRING=ui=ui-libsnes
|
BSNES_TARGET_STRING=ui=ui-libsnes
|
||||||
endif
|
endif
|
||||||
CFLAGS += -DBSNES_V${BSNES_VERSION}
|
CFLAGS += -DBSNES_V${BSNES_VERSION}
|
||||||
else
|
|
||||||
OBJECTS=dummy.$(OBJECT_SUFFIX)
|
|
||||||
endif
|
|
||||||
|
|
||||||
BSNES_LIBRARY=bsnes/out/libsnes.$(ARCHIVE_SUFFIX)
|
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
|
%.$(OBJECT_SUFFIX): %.cpp ports.inc slots.inc regions.inc
|
||||||
$(REALCC) -c -o $@ $< -I../../../include -I../../../bsnes $(CFLAGS) $(BSNES_CFLAGS)
|
$(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:
|
forcelook:
|
||||||
@true
|
@true
|
||||||
|
|
|
@ -2,9 +2,6 @@ ifdef BUILD_GAMBATTE
|
||||||
OBJECTS=core.$(OBJECT_SUFFIX)
|
OBJECTS=core.$(OBJECT_SUFFIX)
|
||||||
GAMBATTE_CFLAGS=
|
GAMBATTE_CFLAGS=
|
||||||
GAMBATTE_LDFLAGS=
|
GAMBATTE_LDFLAGS=
|
||||||
else
|
|
||||||
OBJECTS=dummy.$(OBJECT_SUFFIX)
|
|
||||||
endif
|
|
||||||
|
|
||||||
GAMBATTE_LIBRARY=gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX)
|
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
|
%.$(OBJECT_SUFFIX): %.cpp ports.inc slots.inc regions.inc
|
||||||
$(REALCC) -c -o $@ $< -I../../../include -I../../../gambatte $(CFLAGS) $(GAMBATTE_CFLAGS)
|
$(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:
|
forcelook:
|
||||||
@true
|
@true
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue