[csw-devel] SF.net SVN: gar:[6121] csw/mgar/pkg/wxwidgets/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 6121
          http://gar.svn.sourceforge.net/gar/?rev=6121&view=rev
Author:   wahwah
Date:     2009-08-27 15:45:31 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
wxwidgets: Different options for different Solaris versions. Unicode for Solaris 10.

Modified Paths:
--------------
    csw/mgar/pkg/wxwidgets/trunk/Makefile

Modified: csw/mgar/pkg/wxwidgets/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wxwidgets/trunk/Makefile	2009-08-27 15:21:03 UTC (rev 6120)
+++ csw/mgar/pkg/wxwidgets/trunk/Makefile	2009-08-27 15:45:31 UTC (rev 6121)
@@ -61,8 +61,18 @@
 CATALOGNAME_CSWwxwidgetsgtk2   = wxwidgets_gtk2
 TEST_SCRIPTS =
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += --with-gtk=2 --with-gtk-prefix=/opt/csw --without-regex
-CONFIGURE_ARGS += --enable-unicode --with-opengl
+CONFIGURE_ARGS += --with-gtk=2
+CONFIGURE_ARGS += --with-gtk-prefix=/opt/csw
+CONFIGURE_ARGS += --without-regex
+CONFIGURE_ARGS += --with-opengl
+# Unicode-enabled build on Solaris 8 fails with:
+# "./src/common/wxchar.cpp", line 1693: Error: The function "vswscanf" must have
+# a prototype.
+# Building Unicode support for Solaris 9 and 10 only.
+CONFIGURE_ARGS_5.8  = --disable-unicode
+CONFIGURE_ARGS_5.9  = --enable-unicode
+CONFIGURE_ARGS_5.10 = --enable-unicode
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
 EXTRA_CFLAGS = -fast -xstrconst -xnolibmopt
 EXTRA_INC = /opt/csw/X11/include /usr/X11/include /usr/openwin/share/include
 EXTRA_LIB = /opt/csw/X11/lib


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.