summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2011-05-06 19:42:26 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2011-05-06 19:42:26 +0000
commit62d841c2703286b34983eb8dae174ecbf2c82c5f (patch)
treed97a50172e47372637a155978f3096618da8c275 /makefile
parent987909ff31107893c4b748d86d97619db48c4b47 (diff)
Moved format handling and all formats to separate library [Miodrag Milanovic]
Diffstat (limited to 'makefile')
-rw-r--r--makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/makefile b/makefile
index 634d71c9f5b..c394684bf90 100644
--- a/makefile
+++ b/makefile
@@ -500,6 +500,7 @@ INCPATH += \
-I$(OBJ)/emu \
-I$(OBJ)/emu/layout \
-I$(SRC)/lib/util \
+ -I$(SRC)/lib \
-I$(SRC)/osd \
-I$(SRC)/osd/$(OSD) \
@@ -611,6 +612,8 @@ endif
# add SoftFloat floating point emulation library
SOFTFLOAT = $(OBJ)/libsoftfloat.a
+# add formats emulation library
+FORMATS_LIB = $(OBJ)/libformats.a
#-------------------------------------------------
@@ -722,9 +725,9 @@ $(sort $(OBJDIRS)):
ifndef EXECUTABLE_DEFINED
# always recompile the version string
-$(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(SOFTFLOAT) $(LIBOCORE) $(RESFILE)
+$(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(SOFTFLOAT) $(FORMATS_LIB) $(LIBOCORE) $(RESFILE)
-$(EMULATOR): $(VERSIONOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(ZLIB) $(LIBOCORE) $(RESFILE)
+$(EMULATOR): $(VERSIONOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(FORMATS_LIB) $(ZLIB) $(LIBOCORE) $(RESFILE)
@echo Linking $@...
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
ifeq ($(TARGETOS),win32)