use facename in wxFontRefData::Init() in Unicode build (part of patch 1671684)

[wxWidgets.git] / src / xrc / descrip.mms

diff --git a/src/xrc/descrip.mms b/src/xrc/descrip.mms
index c2058df5f518a3f189e7c168df9786ab0c6cf007..0b3cc126e0a8e35feb0bbf23c70f5a2c42217411 100755 (executable)
--- a/src/xrc/descrip.mms
+++ b/src/xrc/descrip.mms
@@ -1,8 +1,8 @@
 #*****************************************************************************
 #                                                                            *
 # Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                              *
-# Date : 20 October 2004                                                      *
+# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
+# Date : 9 November 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
 
 .suffixes : .cpp
 
@@ -44,7 +50,11 @@ OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
        xh_scrol.obj,xh_scwin.obj,xh_sizer.obj,xh_slidr.obj,xh_spin.obj,\
        xh_split.obj,xh_statbar.obj,xh_stbmp.obj,xh_stbox.obj,xh_stlin.obj,\
        xh_sttxt.obj,xh_text.obj,xh_tglbtn.obj,xh_toolb.obj,xh_tree.obj,\
-       xh_unkwn.obj,xh_wizrd.obj,xmlres.obj,xmlrsall.obj     
+       xh_unkwn.obj,xh_wizrd.obj,xmlres.obj,xmlrsall.obj,xh_listbk.obj,\
+       xh_choicbk.obj,xh_dirpicker.obj,xh_hyperlink.obj,xh_filepicker.obj,\
+       xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\
+       xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
+       xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj
 
 SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\
@@ -53,7 +63,11 @@ SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
        xh_scrol.cpp,xh_scwin.cpp,xh_sizer.cpp,xh_slidr.cpp,xh_spin.cpp,\
        xh_split.cpp,xh_statbar.cpp,xh_stbmp.cpp,xh_stbox.cpp,xh_stlin.cpp,\
        xh_sttxt.cpp,xh_text.cpp,xh_tglbtn.cpp,xh_toolb.cpp,xh_tree.cpp,\
-       xh_unkwn.cpp,xh_wizrd.cpp,xmlres.cpp,xmlrsall.cpp     
+       xh_unkwn.cpp,xh_wizrd.cpp,xmlres.cpp,xmlrsall.cpp,xh_listbk.cpp,\
+       xh_choicbk.cpp,xh_dirpicker.cpp,xh_hyperlink.cpp,xh_filepicker.cpp,\
+       xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\
+       xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
+       xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp
   
 all : $(SOURCES)
        $(MMS)$(MMSQUALIFIERS) $(OBJECTS)
@@ -63,11 +77,15 @@ 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
 
 xh_bmp.obj : xh_bmp.cpp
 xh_bmpbt.obj : xh_bmpbt.cpp
@@ -108,3 +126,19 @@ xh_unkwn.obj : xh_unkwn.cpp
 xh_wizrd.obj : xh_wizrd.cpp
 xmlres.obj : xmlres.cpp
 xmlrsall.obj : xmlrsall.cpp
+xh_listbk.obj : xh_listbk.cpp
+xh_choicbk.obj : xh_choicbk.cpp
+xh_dirpicker.obj : xh_dirpicker.cpp
+xh_hyperlink.obj : xh_hyperlink.cpp
+xh_filepicker.obj : xh_filepicker.cpp
+xh_fontpicker.obj : xh_fontpicker.cpp
+xh_clrpicker.obj : xh_clrpicker.cpp
+xh_odcombo.obj : xh_odcombo.cpp
+xh_mdi.obj : xh_mdi.cpp
+xh_grid.obj : xh_grid.cpp
+xh_datectrl.obj : xh_datectrl.cpp
+xh_treebk.obj : xh_treebk.cpp
+xh_bmpcbox.obj : xh_bmpcbox.cpp
+xh_animatctrl.obj : xh_animatctrl.cpp
+xh_htmllbox.obj : xh_htmllbox.cpp
+xh_collpane.obj : xh_collpane.cpp