X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a7f306263595bff3b74e96e4c2bee6f0a008500..300b1288331acc7ac3482595bb226a52f8aec238:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index d014e9d827..9c40db3f39 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -7,11 +7,17 @@ # If using Cygwin, set this to 0. # If using Mingw32, set this to 1. -MINGW32=1 +MINGW32=0 # Set to the version you have MINGW32VERSION=2.95 +# Set to the appropriate remove command +RM=rm -f + +# Set to the appropriate copy command +COPY=cp + ########################## Compiler ################################## # C++ compiler @@ -142,7 +148,8 @@ endif RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include" -LIBS = $(WXLIB) $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) +#LIBS = $(WXLIB) $(WXDIR)/lib/libzlib.a $(WXDIR)/lib/libpng.a $(WXDIR)/lib/libjpeg.a $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) +LIBS = $(WXLIB) -lpng -ljpeg -lzlib $(WINLIBS) $(COMPLIBS) $(EXTRALIBS) WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION)