From 63aea43ffd5b04ef0c6d246d44e2b162363e4bf8 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Tue, 20 Jul 1999 14:48:03 +0000 Subject: [PATCH] Trying to compile samples git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/minimal/makefile.g95 | 4 ++-- src/makeg95.env | 12 ++++++------ src/makeprog.g95 | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/minimal/makefile.g95 b/samples/minimal/makefile.g95 index f030c04367..18fe2cda7c 100644 --- 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 7cb1697a15..2b5dc81b6e 100644 --- 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 391881439c..f8a9974517 100644 --- 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 -- 2.45.2