Replaced \ with /

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/font/makefile.g95 b/samples/font/makefile.g95
index 1483aaa4765492b4c358d03cfdd1059acdf0ef22..e7f7787fe52ee7e427219d472955dc08bb5ff116 100644 (file)
--- a/samples/font/makefile.g95
+++ b/samples/font/makefile.g95
@@ -12,5 +12,20 @@ WXDIR = ../..
 TARGET=font
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)\src\makeprog.g95
+include $(WXDIR)/src/makeprog.g95
+
+# There is a bug in all 2.95.x versions of gcc that will cause
+# unresolved # references when linking the example here. It has
+# to do with class nesting. Only happens when optimization is
+# turned on.
+#
+# See:
+#
+#   Linkname: g++ bug with classes nested inside functions
+#   URL: http://gcc.gnu.org/ml/gcc-bugs/1999-11/msg00524.html
+#
+# for more info.
+
+OPT := $(filter-out -O -O1 -O2 -O3 -O4 -O5 -O6 -Os, $(OPT))
+
 

diff --git a/samples/propsize/makefile.g95 b/samples/propsize/makefile.g95
index 7a2bd64b3d7ffef26010974cd2e8cb75867511fb..587135b10df0d59c1e659a45f1b34cb91a3078d5 100644 (file)
--- a/samples/propsize/makefile.g95
+++ b/samples/propsize/makefile.g95
@@ -12,5 +12,5 @@ WXDIR = ../..
 TARGET=propsize
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)\src\makeprog.g95
+include $(WXDIR)/src/makeprog.g95