Get Linux builds working again

Fraser J. Gordon · Fraser J. Gordon · commit 507367a721e0 · 2015-01-19T13:39:45.000Z
diff --git a/Makefile b/Makefile
@@ -17,6 +17,9 @@ libexternal:
 libexternalv1:
 	$(MAKE) -C ./libexternalv1 libexternalv1
 
+libffi:
+	$(MAKE) -C ./thirdparty/libffi libffi
+
 libz:
 	$(MAKE) -C ./thirdparty/libz libz
 
@@ -38,7 +41,7 @@ libopenssl:
 libskia:
 	$(MAKE) -C ./thirdparty/libskia libskia
 
-libfoundation:
+libfoundation: libffi
 	$(MAKE) -C ./libfoundation libfoundation
 
 libscript:
@@ -193,10 +196,10 @@ libstdscript: lc-compile
 	$(MAKE) -C ./libscript libstdscript
 
 ########## Compiler
-lc-compile: libscript libfoundation
+lc-compile: libscript libfoundation libffi
 	$(MAKE) -C ./toolchain lc-compile
 
-lc-bootstrap-compile: libscript libfoundation
+lc-bootstrap-compile: libscript libfoundation libffi
 	$(MAKE) -C ./toolchain bootstrap
 
 lc-compile-clean:
diff --git a/engine/Makefile.common b/engine/Makefile.common
@@ -12,12 +12,12 @@ CUSTOM_INCLUDES=\
 	./src \
  	$(MODE_INCLUDES)
 
-CUSTOM_DEPS= libkernel.a libfoundation.a libstdscript.a libpng.a libpcre.a libjpeg.a libopenssl.a libgraphics.a libskia.a $(MODE_DEPS) 
+CUSTOM_DEPS= libkernel.a libfoundation.a libstdscript.a libpng.a libpcre.a libjpeg.a libopenssl.a libgraphics.a libskia.a libffi.a $(MODE_DEPS) 
 
-CUSTOM_LIBS=$(MODE_LIBS) kernel foundation stdscript z gif png pcre jpeg graphics skia openssl
+CUSTOM_LIBS=$(MODE_LIBS) kernel foundation stdscript ffi z gif png pcre jpeg graphics skia openssl
 # Removed: icuio icule iculx 
 CUSTOM_STATIC_LIBS=icudata icuuc icui18n $(MODE_STATIC_LIBS)
-CUSTOM_DYNAMIC_LIBS=dl m pthread ffi $(MODE_DYNAMIC_LIBS)
+CUSTOM_DYNAMIC_LIBS=dl m pthread $(MODE_DYNAMIC_LIBS)
 
 CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -Wno-parentheses \
diff --git a/engine/Makefile.kernel-server b/engine/Makefile.kernel-server
@@ -55,7 +55,7 @@ SOURCES=\
 	bitmapeffect.cpp bitmapeffectblur.cpp md5.cpp sha1.cpp capsule.cpp \
 	externalv0.cpp externalv1.cpp lextable.cpp uuid.cpp \
 	objectprops.cpp objectpropsets.cpp mcutility.cpp notify.cpp customprinter.cpp \
-	sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp sysunxrandom.cpp \
+	sysspec.cpp mode_server.cpp sysunxdate.cpp sysunxnetwork.cpp \
 	srvmain.cpp dsklnx.cpp srvspec.cpp srvsession.cpp srvstack.cpp srvdebug.cpp \
 	srvscript.cpp srvoutput.cpp srvtheme.cpp \
     eventqueue.cpp encodederrors.cpp redraw.cpp tilecache.cpp tilecachesw.cpp \
diff --git a/engine/Makefile.server b/engine/Makefile.server
@@ -19,9 +19,9 @@ CUSTOM_INCLUDES=\
 
 CUSTOM_DEPS=libkernel-server.a
 
-CUSTOM_LIBS=pcre png jpeg z foundation stdscript gif graphics skia kernel-server
+CUSTOM_LIBS=pcre png jpeg z foundation stdscript ffi gif graphics skia kernel-server
 CUSTOM_STATIC_LIBS=curl icudata icui18n icuio icule iculx icuuc customssl customcrypto $(MODE_STATIC_LIBS)
-CUSTOM_DYNAMIC_LIBS=dl m pthread ffi rt
+CUSTOM_DYNAMIC_LIBS=dl m pthread rt
 
 CUSTOM_CCFLAGS=\
 	-Wall -Wno-unused-variable -Wno-switch -Wno-non-virtual-dtor -fno-exceptions -fno-rtti -fno-strict-aliasing \
diff --git a/rules/common.linux.makefile b/rules/common.linux.makefile
@@ -38,7 +38,8 @@ GLOBAL_INCLUDES=\
 	$(SOLUTION_DIR)/thirdparty/libskia/include/pathops \
 	$(SOLUTION_DIR)/thirdparty/libskia/include/ports \
 	$(SOLUTION_DIR)/thirdparty/libskia/include/utils \
-	$(SOLUTION_DIR)/prebuilt/include
+	$(SOLUTION_DIR)/prebuilt/include \
+	$(SOLUTION_DIR)/thirdparty/libffi/linux/i686-pc-linux-gnu
 	
 GLOBAL_LIBS=\
 	$(PREBUILT_LIB_DIR) \
@@ -87,6 +88,10 @@ $(CACHE_DIR)/%.o: %.s
 	mkdir -p $(CACHE_DIR)/$(dir $*)
 	$(CC) $(CCFLAGS) $(addprefix -I,$(INCLUDES)) $(PACKAGE_INCLUDES) $(FALLBACK_INCLUDES) $(addprefix -D,$(DEFINES)) -c -o$(CACHE_DIR)/$*.o ./src/$*.s
 
+$(CACHE_DIR)/%.o: %.S
+	mkdir -p $(CACHE_DIR)/$(dir $*)
+	$(CC) $(CCFLAGS) $(addprefix -I,$(INCLUDES)) $(PACKAGE_INCLUDES) $(FALLBACK_INCLUDES) $(addprefix -D,$(DEFINES)) -c -o$(CACHE_DIR)/$*.o ./src/$*.S
+
 clean:
 	-rm -f $(OBJECTS)
 	-rm -f $(TARGET_PATH)
diff --git a/thirdparty b/thirdparty
@@ -1 +1 @@
-Subproject commit 2a175dbc57b62ab881d000658c7c9373c097e7ba
+Subproject commit c91a90eed61cffa83ca1be81ebd726c9353f971a
diff --git a/toolchain/Makefile b/toolchain/Makefile
@@ -212,7 +212,7 @@ COMPILE_CPPFLAGS=$(CPPFLAGS) \
 # We can't do much about warnings that occur in the generate source
 # code, so don't bother outputting them.
 COMPILE_stage_CFLAGS=$(CFLAGS)
-COMPILE_CFLAGS=$(CFLAGS) -Wall -std=gnu90 -g
+COMPILE_CFLAGS=$(CFLAGS) -Wall -std=gnu89 -g
 
 COMPILE_CXXFLAGS=$(CXXFLAGS) -Wall -g
 
