sdasd

[wxWidgets.git] / src / makeg95.env

diff --git a/src/makeg95.env b/src/makeg95.env
index f9def2d8360702b53aea032a92c391739ec44559..9c40db3f395987f6e0a7e934c988cc20f86c449d 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -7,7 +7,7 @@
 
 # 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
@@ -15,6 +15,9 @@ MINGW32VERSION=2.95
 # Set to the appropriate remove command
 RM=rm -f 
 
+# Set to the appropriate copy command
+COPY=cp
+
 ########################## Compiler ##################################
 
 # C++ compiler
@@ -145,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)