diff options
| author | 2013-06-17 10:27:14 +0000 | |
|---|---|---|
| committer | 2013-06-17 10:27:14 +0000 | |
| commit | 6fbd776a2123a277f890fdd12e2a7c0245981edd (patch) | |
| tree | e958a5ea92caf4b70fe285655b642844f151b325 /makefile | |
| parent | fc2aaf75b4a1409fdda8b7dfa4a2c2a5512b8f11 (diff) | |
put optional cpu, video, sound and machine cores in one library in order to prevent linking issues on small builds, also created temp solution for subtargets for arcade,fruit and pinball machines (nw)
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -636,11 +636,8 @@ OBJDIRS = $(OBJ) $(OBJ)/$(TARGET)/$(SUBTARGET) #------------------------------------------------- LIBEMU = $(OBJ)/libemu.a -LIBCPU = $(OBJ)/$(TARGET)/$(SUBTARGET)/libcpu.a +LIBOPTIONAL = $(OBJ)/$(TARGET)/$(SUBTARGET)/liboptional.a LIBDASM = $(OBJ)/$(TARGET)/$(SUBTARGET)/libdasm.a -LIBSOUND = $(OBJ)/$(TARGET)/$(SUBTARGET)/libsound.a -LIBVIDEO = $(OBJ)/$(TARGET)/$(SUBTARGET)/libvideo.a -LIBMACHINE = $(OBJ)/$(TARGET)/$(SUBTARGET)/libmachine.a LIBUTIL = $(OBJ)/libutil.a LIBOCORE = $(OBJ)/libocore.a LIBOSD = $(OBJ)/libosd.a @@ -822,7 +819,7 @@ $(sort $(OBJDIRS)): ifndef EXECUTABLE_DEFINED -$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBCPU) $(LIBMACHINE) $(LIBEMU) $(LIBDASM) $(LIBSOUND) $(LIBVIDEO) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE) +$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE) $(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ) @echo Linking $@... $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $@ |
