X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9bea227d4eda532f377dde715aab0a1efe98a7bb..f740587c9d406b5c7087853b85dbbb353362cb9a:/src/unix/descrip.mms?ds=sidebyside

diff --git a/src/unix/descrip.mms b/src/unix/descrip.mms
index 10f7ee30ff..942c016821 100644
--- a/src/unix/descrip.mms
+++ b/src/unix/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 10 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 17 December 2010                                                    *
 #                                                                            *
 #*****************************************************************************
 .first
@@ -18,6 +18,11 @@ 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
 .else
+.ifdef __WXGTK2__
+CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm
+.else
 .ifdef __WXX11__
 CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
 	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
@@ -29,6 +34,7 @@ CC_DEFINE =
 .endif
 .endif
 .endif
+.endif
 
 .suffixes : .cpp
 
@@ -37,13 +43,14 @@ CC_DEFINE =
 .c.obj :
 	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
 
-OBJECTS =       baseunix.obj,\
+OBJECTS = appunix.obj,apptraits.obj,\
 		dialup.obj,\
 		dir.obj,\
+		displayx11.obj,\
 		dlunix.obj,\
 		fontenum.obj,\
 		fontutil.obj,\
-		gsocket.obj,\
+		sockunix.obj,\
 		mimetype.obj,\
 		threadpsx.obj,\
 		utilsunx.obj,\
@@ -53,15 +60,17 @@ OBJECTS =       baseunix.obj,\
 		sound.obj,\
 		sound_sdl.obj,\
 		stdpaths.obj,\
-		taskbarx11.obj
+		taskbarx11.obj,\
+		timerunx.obj,evtloopunix.obj,fdiounix.obj,uiactionx11.obj
 
-SOURCES =       baseunix.cpp,\
+SOURCES = appunix.cpp,apptraits.cpp,\
 		dialup.cpp,\
 		dir.cpp,\
+		displayx11.cpp,\
 		dlunix.cpp,\
 		fontenum.cpp,\
 		fontutil.cpp,\
-		gsocket.cpp,\
+		sockunix.cpp,\
 		mimetype.cpp,\
 		threadpsx.cpp,\
 		utilsunx.cpp,\
@@ -71,7 +80,8 @@ SOURCES =       baseunix.cpp,\
 		sound.cpp,\
 		sound_sdl.cpp,\
 		stdpaths.cpp,\
-		taskbarx11.cpp
+		taskbarx11.cpp,\
+		timerunx.cpp,evtloopunix.cpp,fdiounix.cpp,uiactionx11.cpp
 
 all : $(SOURCES)
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -81,22 +91,30 @@ all : $(SOURCES)
 .ifdef __WXGTK__
 	library [--.lib]libwx_gtk.olb $(OBJECTS)
 .else
+.ifdef __WXGTK2__
+	library [--.lib]libwx_gtk2.olb $(OBJECTS)
+.else
 .ifdef __WXX11__
 	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
 .endif
 .endif
 .endif
+.endif
+
+$(OBJECTS) : [--.include.wx]setup.h
 
-baseunix.obj : baseunix.cpp
+appunix.obj : appunix.cpp
+apptraits.obj : apptraits.cpp
 dialup.obj : dialup.cpp
 dir.obj : dir.cpp
 dlunix.obj : dlunix.cpp
 fontenum.obj : fontenum.cpp
 fontutil.obj : fontutil.cpp
-gsocket.obj : gsocket.cpp
-	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn gsocket.cpp
+sockunix.obj : sockunix.cpp
+	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn sockunix.cpp
 mimetype.obj : mimetype.cpp
 threadpsx.obj : threadpsx.cpp
+	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn threadpsx.cpp
 utilsunx.obj : utilsunx.cpp
 utilsx11.obj : utilsx11.cpp
 joystick.obj : joystick.cpp
@@ -105,3 +123,9 @@ sound.obj : sound.cpp
 sound_sdl.obj : sound_sdl.cpp
 stdpaths.obj : stdpaths.cpp
 taskbarx11.obj : taskbarx11.cpp
+displayx11.obj : displayx11.cpp
+timerunx.obj : timerunx.cpp
+evtloopunix.obj : evtloopunix.cpp
+	cxx $(CXXFLAGS)$(CXX_DEFINE)/nowarn evtloopunix.cpp
+fdiounix.obj : fdiounix.cpp
+uiactionx11.obj : uiactionx11.cpp