]> git.saurik.com Git - wxWidgets.git/blobdiff - src/makevc.env
no more _ftime instead of ftime
[wxWidgets.git] / src / makevc.env
index e3b18529c74fc99eafc1a2fdc7d79ec83858bb28..5ff838dfdd0b3ad43a8fbf45567468096170d299 100644 (file)
@@ -8,7 +8,7 @@
 #
 !include <ntwin32.mak>
 
-WXVERSION=21_12
+WXVERSION=21_14
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -39,9 +39,17 @@ 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
+
 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 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)