X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/130d96dcf64bcade6fb6b9da49ee9983ed9872ef..907173e51df6d2a91d65463ddf6ce810d3fd921a:/src/unix/descrip.mms

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 2b3d08c452..b02e9272fc 100644
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -14,21 +14,21 @@ CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
 CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
 .else
 .ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-CXX_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/ieee=denorm
-.else
 CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
 	   /assume=(nostdnew,noglobal_array_new)
 CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.endif
+.else
+.ifdef __WXX11__
+CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
+	/name=(as_is,short)
 .else
 CXX_DEFINE =
 CC_DEFINE =
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -37,7 +37,7 @@ CC_DEFINE =
 .c.obj :
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
-OBJECTS = \
+OBJECTS =       baseunix.obj,\
 		dialup.obj,\
 		dir.obj,\
 		fontenum.obj,\
@@ -46,18 +46,28 @@ OBJECTS = \
 		mimetype.obj,\
 		threadpsx.obj,\
 		utilsunx.obj,\
-		utilsx11.obj
+		utilsx11.obj,\
+		joystick.obj,\
+		snglinst.obj,\
+		sound.obj,\
+		sound_sdl.obj,\
+		taskbarx11.obj
 
-SOURCES = \
+SOURCES =       baseunix.cpp,\
 		dialup.cpp,\
 		dir.cpp,\
 		fontenum.cpp,\
 		fontutil.cpp,\
-		gsocket.c,\
+		gsocket.cpp,\
 		mimetype.cpp,\
 		threadpsx.cpp,\
 		utilsunx.cpp,\
-		utilsx11.cpp
+		utilsx11.cpp,\
+		joystick.cpp,\
+		snglinst.cpp,\
+		sound.cpp,\
+		sound_sdl.cpp,\
+		taskbarx11.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -65,20 +75,27 @@ all : $(SOURCES)
 	library [--.lib]libwx_motif.olb $(OBJECTS)
 .else
 .ifdef __WXGTK__
-.ifdef __WXUNIVERSAL__
-	library [--.lib]libwx_gtk_univ.olb $(OBJECTS)
-.else
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
+.else
+.ifdef __WXX11__
+	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
 
+baseunix.obj : baseunix.cpp
 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp
-gsocket.obj : gsocket.c
+gsocket.obj : gsocket.cpp
+	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn gsocket.cpp
 mimetype.obj : mimetype.cpp
 threadpsx.obj : threadpsx.cpp
 utilsunx.obj : utilsunx.cpp
 utilsx11.obj : utilsx11.cpp
+joystick.obj : joystick.cpp
+snglinst.obj : snglinst.cpp
+sound.obj : sound.cpp
+sound_sdl.obj : sound_sdl.cpp
+taskbarx11.obj : taskbarx11.cpp