X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a7f306263595bff3b74e96e4c2bee6f0a008500..46f9bb9475c95ef7ce6420462253e9382006714c:/src/makeg95.env diff --git a/src/makeg95.env b/src/makeg95.env index d014e9d827..36a2a1d03a 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -12,6 +12,12 @@ MINGW32=1 # 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)