--- a/Make.proto	Wed Jan 23 22:02:49 2013 +0100
+++ b/Make.proto	Wed Jan 23 22:03:31 2013 +0100
@@ -87,8 +87,8 @@
 CLASSLIBDIRS    =   $(STANDARD_DIR) $(PRIVATE_CLASSLIBDIRS) $(ARCH_CLASSLIBDIRS)
 LIBOBJS         =   $(STANDARD_LIB) $(PRIVATE_OBJS)
 LINK_LIBOBJS    =   $(LINK_STANDARD_LIB) $(PRIVATE_OBJS)
-STATIC_LIBOBJS  =   $(STATIC_STANDARD_LIB) $(PRIVATE_OBJS)
-LIBLIST         =   $(STANDARD_LIST) $(PRIVATE_LIBS)
+STATIC_LIBOBJS  =   $(STATIC_STANDARD_LIB) $(PRIVATE_OBJS) $(STATIC_LIBOBJC)
+LIBLIST         =   $(STANDARD_LIST) $(PRIVATE_LIBS) libstx_libobjc
 
 # WORKSTAT1       =   XWorkstation
 # WORKSTAT2       =   GLXWorkstation
@@ -110,6 +110,8 @@
 OPTIONAL_GL_LIB         =   $(LIB_GL)
 OPTIONAL_LINK_GL_LIB    =   $(LINK_LIB_GL)
 
+STATIC_ADDITIONAL_OBJS=/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation
+
 # ---------------------- end additional stuff --------------------
 
 
@@ -187,11 +189,12 @@
 	@$(MAKE) linkTarget \
 		LIBOBJS="" \
 		LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \
-		LINK_LIBOBJS="$(STATIC_LIBOBJS)" \
+		LINK_LIBOBJS="$(STATIC_LIBOBJS) $(STATIC_EXTRA_UI_OBJ)" \
 		LINK_LIBRUN="$(STATIC_LIBRUN)" \
 		LIBRUN="$(STATIC_LIBRUN)" \
 		ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \
 		ADDITIONAL_CLASSES=$(STATIC_ADDITIONAL_CLASSES) \
+		EXTRA_LIBS="$(STATIC_EXTRA_LIBS)" \
 		LIBLIST="$(LIBLIST) $(EXTRA_UI_CLASSES)"
 	@$(MAKE) removeLinkLibs
 
@@ -205,7 +208,7 @@
 	@$(MAKE) linkTarget \
 		LIBOBJS="" \
 		LINK_OBJS="$(STATIC_OBJS) $(STATIC_EXTRA_UI_OBJ)" \
-		LINK_LIBOBJS="$(STATIC_LIBOBJS)" \
+		LINK_LIBOBJS="$(STATIC_LIBOBJS) $(STATIC_EXTRA_UI_OBJ)" \
 		LINK_LIBRUN="$(STATIC_LIBRUN)" \
 		LIBRUN="$(STATIC_LIBRUN)" \
 		ADDITIONAL_OBJS=$(STATIC_ADDITIONAL_OBJS) \