summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-03-08 18:39:50 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-03-08 18:39:50 +0000
commitd00673890ddf6a587e7c64584078e52dccfe94f1 (patch)
tree5f391c3ccf8ed2e0ceeed598e5dcdabb77e34510 /makefile
parent5f2d9482dc05b7d247b0b1eb8345c9f8fc271731 (diff)
For now keep only bus part in separate library to make visual studio builds possible (nw)
Diffstat (limited to 'makefile')
-rw-r--r--makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/makefile b/makefile
index 8e22b9dd7c5..47db5dc3814 100644
--- a/makefile
+++ b/makefile
@@ -678,6 +678,7 @@ OBJDIRS = $(OBJ) $(OBJ)/$(TARGET)/$(SUBTARGET)
LIBEMU = $(OBJ)/libemu.a
LIBOPTIONAL = $(OBJ)/$(TARGET)/$(SUBTARGET)/liboptional.a
+LIBBUS = $(OBJ)/$(TARGET)/$(SUBTARGET)/libbus.a
LIBDASM = $(OBJ)/$(TARGET)/$(SUBTARGET)/libdasm.a
LIBUTIL = $(OBJ)/libutil.a
LIBOCORE = $(OBJ)/libocore.a
@@ -870,7 +871,7 @@ $(sort $(OBJDIRS)):
ifndef EXECUTABLE_DEFINED
-$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(WEB_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
+$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(WEB_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
@echo Linking $@...
$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@