no more _ftime instead of ftime

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 68e7bf0b16509de17266cfcc0ce7d90d9dcc4c02..5ff838dfdd0b3ad43a8fbf45567468096170d299 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

-WXVERSION=21_11
+WXVERSION=21_14

 WIN95=1
 
 !if "$(WIN95)" == "0"
 WIN95=1
 
 !if "$(WIN95)" == "0"


@@ -39,11 +39,19 @@ WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 #WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
 # comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 #WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
 # comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2

+

 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
  comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
 
 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
  comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
 

-# Change this to your WXWIN directory
-WXDIR=j:\dev\wx2\wxWindows
+##WINLIBS=kernel32.lib advapi32.lib user32.lib gdi32.lib comdlg32.lib \
+##     comctl32.lib ole32.lib oleaut32.lib rpcrt4.lib winmm.lib
+
+#winspool.lib winmm.lib shell32.lib oldnames.lib\
+# ctl3d32.lib odbc32.lib uuid.lib rpcrt4.lib  # libci.lib # libci.lib required for VC++ 4.2
+
+
+# Set a WXWIN environment variable be the path to your WXWIN directory
+WXDIR=$(WXWIN)

 
 WXSRC=$(WXDIR)\src\msw
 WXINC=$(WXDIR)\include
 
 WXSRC=$(WXDIR)\src\msw
 WXINC=$(WXDIR)\include


@@ -139,8 +147,8 @@ D=$(D)DLL
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 

-INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\xpm.lib
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\xpm.lib

 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=