X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/014e19de74c30b5421b6906b762e051e020ac391..1f752a2282fb36bb5e429c8c83e589b9ac66d7cb:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index 1485e1d8b8..71ca65a9f0 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -18,7 +18,7 @@ MINGW32=1 MINGW32VERSION=2.95 # If building DLL, the version -WXVERSION=23_1 +WXVERSION=23_2 # Say yes if you have a "modern" linker that supports --shared option. # Note that you're probably going to wait forever for dlltool/gcc/etc @@ -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 \