Committing in .
VMS/GTK compile support Modified Files: wxWindows/descrip.mms wxWindows/setup.h_vms wxWindows/samples/minimal/descrip.mms wxWindows/src/common/descrip.mms wxWindows/src/common/resource.cpp wxWindows/src/generic/descrip.mms wxWindows/src/gtk/dcclient.cpp wxWindows/src/gtk/filedlg.cpp wxWindows/src/gtk/fontdlg.cpp wxWindows/src/gtk/listbox.cpp wxWindows/src/gtk/tbargtk.cpp wxWindows/src/gtk/win_gtk.c wxWindows/src/unix/descrip.mms wxWindows/src/unix/fontenum.cpp Added Files: wxWindows/lib/vms_gtk.opt wxWindows/src/gtk/wx_gtk_vmsjackets.c ---------------------------------------------------------------------- git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -11,8 +11,12 @@
|
||||
.ifdef __WXMOTIF__
|
||||
CXX_DEFINE = /define=(__WXMOTIF__=1)
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
CXX_DEFINE = /define=(__WXGTK__=1)
|
||||
.else
|
||||
CXX_DEFINE =
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.suffixes : .cpp
|
||||
|
||||
@@ -45,6 +49,10 @@ all : $(SOURCES)
|
||||
$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
|
||||
.ifdef __WXMOTIF__
|
||||
library [--.lib]libwx_motif.olb $(OBJECTS)
|
||||
.else
|
||||
.ifdef __WXGTK__
|
||||
library [--.lib]libwx_gtk.olb $(OBJECTS)
|
||||
.endif
|
||||
.endif
|
||||
|
||||
dialup.obj : dialup.cpp
|
||||
|
@@ -30,7 +30,14 @@
|
||||
#include "wx/fontenum.h"
|
||||
#include "wx/fontutil.h"
|
||||
|
||||
#ifdef __VMS__ // Xlib.h for VMS is not (yet) compatible with C++
|
||||
// The resulting warnings are switched off here
|
||||
#pragma message disable nosimpint
|
||||
#endif
|
||||
#include <X11/Xlib.h>
|
||||
#ifdef __VMS__
|
||||
#pragma message enable nosimpint
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private functions
|
||||
|
Reference in New Issue
Block a user