summaryrefslogtreecommitdiffstatshomepage
path: root/makefile
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-06-06 10:11:31 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-06-06 10:11:31 +0000
commit991212c069ea15fbdd5e3330f681aa60148fd7b0 (patch)
treeb4600fee55b25a9e3f51d26a277681bd4915da3b /makefile
parent08dc361f462ee7e58ece9f6b43a577a1dea02e46 (diff)
-Created machine_manager as singleton class that contains (for now) one running machine [Miodrag Milanovic]
-Updated LUA engine to run in machine_manager instead of being initialized per machine -Added "-console" option so emulator can be started with LUA enabled console -Update LUA to version 5.2.3 -Enabled SQLite3 to be compiled and added LUA module for it
Diffstat (limited to 'makefile')
-rw-r--r--makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/makefile b/makefile
index c87ded95155..8fe2f8b4d89 100644
--- a/makefile
+++ b/makefile
@@ -885,7 +885,7 @@ $(sort $(OBJDIRS)):
ifndef EXECUTABLE_DEFINED
-$(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)
+$(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(SQLITE3_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 $@