Corrected line endings, deps now relative

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 46c9254159c4e74d00c4097fecb5412a9eb00c31..2daa2530dca498f418bf6255ca1c1ca9c2084f9d 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -15,11 +15,17 @@
 MINGW32=1
 
 # Set to the version you have
-MINGW32VERSION=2.95
-#MINGW32VERSION=3.0
+#MINGW32VERSION=2.95
+MINGW32VERSION=3.0
+
+# If we're using MSYS, or other utilities that
+# use forward slashes, we need to set this when
+# invoking the makefile from DOS, or the wrong separators
+# will be assumed.
+#OSTYPE=msys
 
 # If building DLL, the version
-WXVERSION=233
+WXVERSION=250
 
 ifndef UNICODE
   UNICODE=0
@@ -285,11 +291,14 @@ ifeq ($(wxUSE_GUI),1)
 endif
 LDFLAGS = $(WINDOWSLDFLAGS) $(COMMON_THREADFLAGS) -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib $(EXTRALDFLAGS)
 
-.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .c
+.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .cc .c
 
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $*.c
 
+.cc.o:
+       $(CC) -c $(CPPFLAGS) -o $@ $*.cc
+
 .cxx.o:
        $(CC) -c $(CPPFLAGS) -o $@ $*.cxx