More small fixes

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index 1485e1d8b8bb3e27f419d71c5d6a0908303c2cbd..dcb14319bbd9a0e28bea2c7be2fa67c511c9ef1e 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -83,7 +83,7 @@ RCDEFSWITCH=--define
 
 # Don't make this too long (e.g. by adding contrib/include/wx) because it will
 # truncate the command line
-RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
+RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__
 
 # Needed to build a DLL if your linker does not support --shared option.
 AS = $(CROSS)as
@@ -151,11 +151,11 @@ COMPPATHS=
 
 ########################## Directories ###############################
 
+OLELIBS=-lole32 -loleaut32 -luuid
 WINLIBS=-lstdc++ -lgcc \
        -lwinspool -lwinmm -lshell32 \
        -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
-       -lole32 -loleaut32 -luuid \
-       -lodbc32 -lwsock32 -lopengl32 -lglu32 #  -loldnames
+       -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) #  -loldnames
 
 #WINLIBS=-lstdc++ -lgcc \
 #      -lwinspool -lwinmm -lshell32 \