X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe5de1ea1041bc97e3e2735e6866ad3485eea78c..de628f984b1f5f57995d9ca3c26dfe79fa3dae59:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index 39f402da26..2daa2530dc 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -18,8 +18,14 @@ MINGW32=1 #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