Trying to compile samples

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

diff --git a/samples/minimal/makefile.g95 b/samples/minimal/makefile.g95
index f030c043673e3aab25ca70aacf677f5cf65159fe..18fe2cda7c45c0d4414b83593828139d0047c2db 100644 (file)
--- a/samples/minimal/makefile.g95
+++ b/samples/minimal/makefile.g95
@@ -7,10 +7,10 @@
 #
 # Makefile for wxWindows sample (Cygwin/Mingw32).
 
-WXDIR = ../..
+WXDIR = ..\..
 
 TARGET=minimal
 OBJECTS = $(TARGET).o
 
-include $(WXDIR)/src/makeprog.g95
+include $(WXDIR)\src\makeprog.g95
 

diff --git a/src/makeg95.env b/src/makeg95.env
index 7cb1697a1569d794a7a9011719fe19cbcd331647..2b5dc81b6ed9cec3b18086323f5f5aba22459cde 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -49,7 +49,7 @@ RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
 
-RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+RESFLAGS=$(RCINCSWITCH) $(WXDIR)\include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 ########################## Compiler flags #############################
 
@@ -122,11 +122,11 @@ WINLIBS=-lstdc++ -lgcc \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 #  -loldnames
 
 # Shouldn't need to change these...
-WXSRC=$(WXDIR)/src/msw
-WXINC=$(WXDIR)/include
-WXBASESRC=$(WXDIR)/src/common
-WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
+WXSRC=$(WXDIR)\src\msw
+WXINC=$(WXDIR)\include
+WXBASESRC=$(WXDIR)\src\common
+WXLIB=$(WXDIR)\lib\$(LIBPREFIX)wx.$(LIBSUFF)
+INC = -I$(WXINC) -I$(WXDIR)\src\png -I$(WXDIR)\src\jpeg -I$(WXDIR)\include\wx\msw\gnuwin32 -I$(WXDIR)\src\zlib $(EXTRAINC) $(COMPPATHS)
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)

diff --git a/src/makeprog.g95 b/src/makeprog.g95
index 391881439cbb9c2f580e397865f56da319d9f0ab..f8a9974517f30350a4ce48e6916aa07dec32da8f 100644 (file)
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -7,7 +7,7 @@
 #
 # Include file for Cygwin/Mingw32 samples
 
-WXDIR = $(WXWIN)
+# WXDIR = $(WXWIN)
 
 include $(WXDIR)/src/makeg95.env