empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move emulation core bindings to their own directories

Browse source
This commit is contained in:
Ilari Liusvaara 2013-01-12 14:57:58 +02:00
parent c4b03bfcac
commit 67ac06c6ad
9 changed files with 127 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
Makefile
View file

@ -10,50 +10,9 @@ REALCC = $(CROSS_PREFIX)$(CC)
REALLD = $(CROSS_PREFIX)$(LD)
REALRANLIB = $(CROSS_PREFIX)$(RANLIB)
CORE_DEFINE=
CORE_OBJECT=
CORE_OBJECTS=
CORE_PATH=
ifdef BSNES_VERSION
CORE_PATH+=-I$(shell pwd)/bsnes
CORE_OBJECT+=../bsnes/out/libsnes.$(ARCHIVE_SUFFIX)
CORE_OBJECTS+=bsnes/out/libsnes.$(ARCHIVE_SUFFIX)
CORE_DEFINE+=-DCORETYPE_BSNES=1
ifdef BSNES_IS_COMPAT
CFLAGS += -DBSNES_IS_COMPAT
BSNES_PROFILE_STRING=profile=compatibility
else
BSNES_PROFILE_STRING=profile=accuracy
endif
ifeq ($(BSNES_VERSION), 084)
BSNES_PROFILE_STRING+=options=debugger
CFLAGS += -DBSNES_HAS_DEBUGGER
else
ifeq ($(BSNES_VERSION), 085)
BSNES_PROFILE_STRING+=options=debugger
CFLAGS += -DBSNES_HAS_DEBUGGER
endif
endif
ifeq ($(BSNES_VERSION), 087)
BSNES_TARGET_STRING=target=libsnes
else
BSNES_TARGET_STRING=ui=ui-libsnes
endif
CFLAGS += -DBSNES_V${BSNES_VERSION}
BUILD_BSNES=1
endif
ifdef BUILD_GAMBATTE
CORE_PATH+=-I$(shell pwd)/gambatte
CORE_OBJECT+=../gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX)
CORE_OBJECTS+=gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX)
CORE_DEFINE+=-DCORETYPE_GAMBATTE=1
endif
#Flags.
HOSTCCFLAGS = -std=gnu++0x
CFLAGS += $(CORE_PATH) $(CORE_DEFINE) -std=gnu++0x $(USER_CFLAGS)
CFLAGS += -std=gnu++0x $(USER_CFLAGS)
ifdef BOOST_NEEDS_MT
BOOST_LIB_POSTFIX=-mt
else
@ -84,19 +43,12 @@ LDFLAGS += $(shell $(CROSS_PREFIX)pkg-config $(LUA) --libs)
compiler=$(subst ++,cc,$(REALCC))
gambatte_compiler=$(REALCC)
ifdef BUILD_BSNES
bsnes/out/libsnes.$(ARCHIVE_SUFFIX): forcelook
$(MAKE) -C bsnes $(BSNES_PROFILE_STRING) $(BSNES_TARGET_STRING)
$(REALRANLIB) bsnes/out/libsnes.$(ARCHIVE_SUFFIX)
endif
ifdef BUILD_GAMBATTE
gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX): forcelook
$(MAKE) -C gambatte
$(REALRANLIB) gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX)
endif
src/__all_files__: src/core/version.cpp forcelook $(CORE_OBJECTS)
src/__all_files__: src/core/version.cpp forcelook
$(MAKE) -C src precheck
$(MAKE) -C src
cp src/lsnes$(DOT_EXECUTABLE_SUFFIX) .
@ -108,8 +60,6 @@ src/core/version.cpp: buildaux/version.exe forcelook
clean:
-$(MAKE) -C bsnes clean
-$(MAKE) -C gambatte clean
$(MAKE) -C src clean
forcelook:

17
src/Makefile
View file

@ -20,8 +20,8 @@ CFLAGS += -DWITH_OPUS_CODEC
LDFLAGS += -lopus
endif
DUMMY_LIBRARY=core lua fonts library interface video dummy
PLATFORM_LIBRARY=core lua fonts library interface video platform
DUMMY_LIBRARY=core lua fonts library interface video emulation dummy
PLATFORM_LIBRARY=core lua fonts library interface video emulation platform
ALLOBJECT=__all__.$(OBJECT_SUFFIX)
ALLFLAGS=__all__.ldflags
DUMMY_LIBRARY_OBJS=$(patsubst %,%/$(ALLOBJECT),$(DUMMY_LIBRARY))
@ -36,6 +36,9 @@ core/$(ALLOBJECT): forcelook
dummy/$(ALLOBJECT): forcelook
$(MAKE) -C dummy
emulation/$(ALLOBJECT): forcelook
$(MAKE) -C emulation
fonts/$(ALLOBJECT): forcelook
$(MAKE) -C fonts
@ -71,11 +74,10 @@ lsnes$(DOT_EXECUTABLE_SUFFIX): $(PLATFORM_LIBRARY_OBJS)
precheck:
$(MAKE) -C core precheck
$(MAKE) -C dummy precheck
$(MAKE) -C emulation precheck
$(MAKE) -C interface precheck
$(MAKE) -C library precheck
$(MAKE) -C lua precheck
$(MAKE) -C dummy precheck
$(MAKE) -C library precheck
$(MAKE) -C interface precheck
$(MAKE) -C platform precheck
$(MAKE) -C util precheck
$(MAKE) -C video precheck
@ -84,12 +86,11 @@ clean:
rm -f *.$(OBJECT_SUFFIX) *.ldflags
$(MAKE) -C core clean
$(MAKE) -C dummy clean
$(MAKE) -C emulation clean
$(MAKE) -C fonts clean
$(MAKE) -C interface clean
$(MAKE) -C library clean
$(MAKE) -C lua clean
$(MAKE) -C dummy clean
$(MAKE) -C library clean
$(MAKE) -C interface clean
$(MAKE) -C platform clean
$(MAKE) -C util clean
$(MAKE) -C video clean

29
src/emulation/Makefile Normal file
View file

@ -0,0 +1,29 @@
CORES=bsnes-legacy gambatte
ALLOBJECT=__all__.$(OBJECT_SUFFIX)
ALLFLAGS=__all__.ldflags
CORES_OBJS=$(patsubst %,%/$(ALLOBJECT),$(CORES))
CORES_FLAGS=$(patsubst %,%/$(ALLFLAGS),$(CORES))
$(ALLOBJECT): $(CORES_OBJS)
$(REALLD) -r -o $@ $^
cat $(CORES_FLAGS) >$(ALLFLAGS)
bsnes-legacy/$(ALLOBJECT): forcelook
$(MAKE) -C bsnes-legacy
gambatte/$(ALLOBJECT): forcelook
$(MAKE) -C gambatte
.PRECIOUS: %.$(OBJECT_SUFFIX)
precheck:
$(MAKE) -C bsnes-legacy precheck
$(MAKE) -C gambatte precheck
clean:
rm -f *.$(OBJECT_SUFFIX) *.ldflags
$(MAKE) -C bsnes-legacy clean
$(MAKE) -C gambatte clean
forcelook:
@true

53
src/emulation/bsnes-legacy/Makefile Normal file
View file

@ -0,0 +1,53 @@
ifdef BSNES_VERSION
OBJECTS=core.$(OBJECT_SUFFIX)
BSNES_CFLAGS=
BSNES_LDFLAGS=
ifdef BSNES_IS_COMPAT
CFLAGS += -DBSNES_IS_COMPAT
BSNES_PROFILE_STRING=profile=compatibility
else
BSNES_PROFILE_STRING=profile=accuracy
endif
ifeq ($(BSNES_VERSION), 084)
BSNES_PROFILE_STRING+=options=debugger
CFLAGS += -DBSNES_HAS_DEBUGGER
else
ifeq ($(BSNES_VERSION), 085)
BSNES_PROFILE_STRING+=options=debugger
CFLAGS += -DBSNES_HAS_DEBUGGER
endif
endif
ifeq ($(BSNES_VERSION), 087)
BSNES_TARGET_STRING=target=libsnes
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)
.PRECIOUS: %.$(OBJECT_SUFFIX)
__all__.$(OBJECT_SUFFIX): $(OBJECTS) ../../../$(BSNES_LIBRARY)
$(REALLD) -r -o $@ $^
echo $(BSNES_LDFLAGS) ../$(BSNES_LIBRARY) >__all__.ldflags
../../../$(BSNES_LIBRARY): forcelook
$(MAKE) -C ../../../bsnes $(BSNES_PROFILE_STRING) $(BSNES_TARGET_STRING)
$(REALRANLIB) $@
%.$(OBJECT_SUFFIX): %.cpp
$(REALCC) -c -o $@ $< -I../../../include -I../../../bsnes $(CFLAGS) $(BSNES_CFLAGS)
forcelook:
@true
precheck:
@true
clean:
rm -f *.$(OBJECT_SUFFIX) *.ldflags
make -C ../../../bsnes clean

3
src/core/bsnes-legacy.cpp → src/emulation/bsnes-legacy/core.cpp
View file

@ -1,4 +1,3 @@
#ifdef CORETYPE_BSNES
#include "lsnes.hpp"
#include <sstream>
#include <map>
@ -1522,5 +1521,3 @@ again2:
void snesdbg_on_trace() {}
#endif
}
#endif

1
src/emulation/bsnes-legacy/dummy.cpp Normal file
View file

@ -0,0 +1 @@
char SYMBOL_32662363263262733;

32
src/emulation/gambatte/Makefile Normal file
View file

@ -0,0 +1,32 @@
ifdef BUILD_GAMBATTE
OBJECTS=core.$(OBJECT_SUFFIX)
GAMBATTE_CFLAGS=
GAMBATTE_LDFLAGS=
else
OBJECTS=dummy.$(OBJECT_SUFFIX)
endif
GAMBATTE_LIBRARY=gambatte/libgambatte/libgambatte.$(ARCHIVE_SUFFIX)
.PRECIOUS: %.$(OBJECT_SUFFIX)
__all__.$(OBJECT_SUFFIX): $(OBJECTS) ../../../$(GAMBATTE_LIBRARY)
$(REALLD) -r -o $@ $^
echo $(GAMBATTE_LDFLAGS) ../$(GAMBATTE_LIBRARY) >__all__.ldflags
../../../$(GAMBATTE_LIBRARY): forcelook
$(MAKE) -C ../../../gambatte
$(REALRANLIB) $@
%.$(OBJECT_SUFFIX): %.cpp
$(REALCC) -c -o $@ $< -I../../../include -I../../../gambatte $(CFLAGS) $(GAMBATTE_CFLAGS)
forcelook:
@true
precheck:
@true
clean:
make -C ../../../gambatte clean
rm -f *.$(OBJECT_SUFFIX) *.ldflags

3
src/core/gambatte.cpp → src/emulation/gambatte/core.cpp
View file

@ -1,4 +1,3 @@
#ifdef CORETYPE_GAMBATTE
#include "lsnes.hpp"
#include <sstream>
#include <iostream>
@ -594,5 +593,3 @@ namespace
instance->saveState(x, cmp_save);
});
}
#endif

1
src/emulation/gambatte/dummy.cpp Normal file
View file

@ -0,0 +1 @@
char SYMBOL_52896932693286932683296;