more xpm fixes

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index ace66917c32427a167cab83f3e8485015a46afb8..26fff919289cc0118108bf1e380c0461871bbc66 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -28,7 +28,12 @@ LD_SUPPORTS_SHARED=yes
 RM=rm -f 
 
 # Set to the appropriate copy command
-COPY=cp
+# Some possible alternatives:
+# COPY=cp and COPYSEP=/
+# COPY=copy and COPYSEP=\
+#
+COPY=copy
+COPYSEP=\
 
 # Cross compiling? Provide the target prefix (eg., i386-mingw32-)
 # CROSS=i386-mingw32-
@@ -71,7 +76,9 @@ RCINPUTSWITCH=-i
 RCOUTPUTSWITCH=-o
 RCINCSWITCH=--include-dir
 RCDEFSWITCH=--define
-RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
+# Note that this can cause windres to fail (Win95/98 problem?)
+# but commenting out RCPREPROCESSOR then does the trick.
+#RCPREPROCESSOR=--preprocessor "$(CC) -c -E -xc-header -DRC_INVOKED"
 
 RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
@@ -209,10 +216,11 @@ LDFLAGS = $(WINDOWSLDFLAGS) -L$(WXDIR)/lib $(EXTRALDFLAGS)
 
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
-.$(SRCSUFF).$(OBJSUFF):
-       $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
 
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $*.c
 
+.$(SRCSUFF).$(OBJSUFF):
+       $(CC) -c $(CPPFLAGS) -o $@ $*.$(SRCSUFF)
+