X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/777105f2b7f91a17fab7d9c4808e282547bb9393..852b6c3ce7baa055da25f5254f6ee2eee0cd79b7:/src/common/descrip.mms

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 7a95337183..188a08022e 100644
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 9 November 1999                                                     *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 29 May 2006                                                         *
 #                                                                            *
 #*****************************************************************************
 .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=1)/float=ieee/name=(as_is,short)/ieee=denorm\
+	   /assume=(nostdnew,noglobal_array_new)
+CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/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
 
 YACC=bison/yacc
 
@@ -58,6 +64,8 @@ OBJECTS = \
 		cmndata.obj,\
 		config.obj,\
 		containr.obj,\
+		convauto.obj,\
+		colourcmn.obj,\
 		cshelp.obj,\
 		ctrlcmn.obj,\
 		ctrlsub.obj,\
@@ -73,10 +81,12 @@ OBJECTS = \
 		dobjcmn.obj,\
 		docmdi.obj,\
 		docview.obj,\
+		dpycmn.obj,\
 		dynarray.obj,\
 		dynlib.obj,\
 		encconv.obj,\
 		event.obj,\
+		evtloopcmn.obj,\
 		extended.obj,\
 		fddlgcmn.obj,\
 		ffile.obj,\
@@ -88,12 +98,14 @@ OBJECTS = \
 		fldlgcmn.obj,\
 		fmapbase.obj,\
 		fontcmn.obj,\
+		fontenumcmn.obj,\
 		fontmap.obj,\
 		framecmn.obj
 
 OBJECTS1=fs_inet.obj,\
 		fs_zip.obj,\
 		ftp.obj,\
+		gaugecmn.obj,\
 		gdicmn.obj,\
 		gifdecod.obj,\
 		hash.obj,\
@@ -135,6 +147,7 @@ OBJECTS1=fs_inet.obj,\
 		process.obj,\
 		protocol.obj,\
 		quantize.obj,\
+		radiocmn.obj,\
 		rendcmn.obj,\
 		sckaddr.obj,\
 		sckfile.obj,\
@@ -150,8 +163,9 @@ OBJECTS1=fs_inet.obj,\
 		strconv.obj,\
 		stream.obj,\
 		string.obj,\
-		sysopt.obj,\
-		tbarbase.obj,\
+		sysopt.obj
+
+OBJECTS2=tbarbase.obj,\
 		textbuf.obj,\
 		textcmn.obj,\
 		textfile.obj,\
@@ -160,9 +174,8 @@ OBJECTS1=fs_inet.obj,\
 		toplvcmn.obj,\
 		treebase.obj,\
 		txtstrm.obj,\
-		url.obj
-
-OBJECTS2=utilscmn.obj,\
+		url.obj,\
+		utilscmn.obj,\
 		rgncmn.obj,\
 		uri.obj,\
 		valgen.obj,\
@@ -176,12 +189,13 @@ OBJECTS2=utilscmn.obj,\
 		zipstrm.obj,\
 		zstream.obj
 
-OBJECTS_MOTIF=gaugecmn.obj
+OBJECTS_MOTIF=radiocmn.obj
 
 OBJECTS_X11=accesscmn.obj,dndcmn.obj,dpycmn.obj,dseldlg.obj,\
-	dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,gaugecmn.obj,\
+	dynload.obj,effects.obj,fddlgcmn.obj,fs_mem.obj,\
 	gbsizer.obj,geometry.obj,matrix.obj,radiocmn.obj,\
-	regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj
+	regex.obj,taskbarcmn.obj,xti.obj,xtistrm.obj,xtixml.obj,\
+	combocmn.obj
 
 SOURCES = \
 		appbase.cpp,\
@@ -198,6 +212,8 @@ SOURCES = \
 		cmndata.cpp,\
 		config.cpp,\
 		containr.cpp,\
+		convauto.cpp,\
+		colourcmn.cpp,\
 		cshelp.cpp,\
 		ctrlcmn.cpp,\
 		ctrlsub.cpp,\
@@ -213,10 +229,12 @@ SOURCES = \
 		dobjcmn.cpp,\
 		docmdi.cpp,\
 		docview.cpp,\
+		dpycmn.cpp,\
 		dynarray.cpp,\
 		dynlib.cpp,\
 		encconv.cpp,\
 		event.cpp,\
+		evtloopcmn.cpp,\
 		extended.c,\
 		ffile.cpp,\
 		fddlgcmn.cpp,\
@@ -228,6 +246,7 @@ SOURCES = \
 		fldlgcmn.cpp,\
 		fmapbase.cpp,\
 		fontcmn.cpp,\
+		fontenumcmn.cpp,\
 		fontmap.cpp,\
 		framecmn.cpp,\
 		fs_inet.cpp,\
@@ -275,6 +294,7 @@ SOURCES = \
 		process.cpp,\
 		protocol.cpp,\
 		quantize.cpp,\
+		radiocmn.cpp,\
 		rendcmn.cpp,\
 		rgncmn.cpp,\
 		sckaddr.cpp,\
@@ -348,6 +368,11 @@ all : $(SOURCES)
 	library [--.lib]libwx_gtk.olb $(OBJECTS1)
 	library [--.lib]libwx_gtk.olb $(OBJECTS2)
 .else
+.ifdef __WXGTK2__
+	library [--.lib]libwx_gtk2.olb $(OBJECTS)
+	library [--.lib]libwx_gtk2.olb $(OBJECTS1)
+	library [--.lib]libwx_gtk2.olb $(OBJECTS2)
+.else
 .ifdef __WXX11__
 	$(MMS)$(MMSQUALIFIERS) $(OBJECTS_X11)
 	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
@@ -357,6 +382,7 @@ all : $(SOURCES)
 .endif
 .endif
 .endif
+.endif
 
 appbase.obj : appbase.cpp
 appcmn.obj : appcmn.cpp
@@ -372,6 +398,8 @@ cmdproc.obj : cmdproc.cpp
 cmndata.obj : cmndata.cpp
 config.obj : config.cpp
 containr.obj : containr.cpp
+convauto.obj : convauto.cpp
+colourcmn.obj : colourcmn.cpp
 cshelp.obj : cshelp.cpp
 ctrlcmn.obj : ctrlcmn.cpp
 ctrlsub.obj : ctrlsub.cpp
@@ -391,6 +419,7 @@ dynarray.obj : dynarray.cpp
 dynlib.obj : dynlib.cpp
 encconv.obj : encconv.cpp
 event.obj : event.cpp
+evtloopcmn.obj : evtloopcmn.cpp
 extended.obj : extended.c
 ffile.obj : ffile.cpp
 fddlgcmn.obj : fddlgcmn.cpp
@@ -402,6 +431,7 @@ filesys.obj : filesys.cpp
 fldlgcmn.obj : fldlgcmn.cpp
 fmapbase.obj : fmapbase.cpp
 fontcmn.obj : fontcmn.cpp
+fontenumcmn.obj : fontenumcmn.cpp
 fontmap.obj : fontmap.cpp
 framecmn.obj : framecmn.cpp
 fs_inet.obj : fs_inet.cpp
@@ -449,6 +479,7 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
+radiocmn.obj : radiocmn.cpp
 rendcmn.obj : rendcmn.cpp
 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
@@ -505,3 +536,5 @@ xti.obj : xti.cpp
 xtistrm.obj : xtistrm.cpp
 xtixml.obj : xtixml.cpp
 uri.obj : uri.cpp
+dpycmn.obj : dpycmn.cpp
+combocmn.obj : combocmn.cpp