Fixed a typo in makefile.vc, updated version numbers in templates
(.DSPs were already up to date). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
dc259b7926
commit
c3f64df223
@ -92,7 +92,7 @@ PERIPH_CLEAN_TARGET=
|
||||
# Set to 0 if not using GLCanvas (only affects DLL build)
|
||||
USE_GLCANVAS=1
|
||||
|
||||
# Set to 0 if you are using MSVC 5
|
||||
# Set to 1 if you are using MSVC 5
|
||||
USE_MSVC_5=0
|
||||
|
||||
# These are absolute paths, so that the compiler
|
||||
@ -294,7 +294,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
|
||||
$(link) @<<
|
||||
$(LINKFLAGS) $(INCREMENTAL)
|
||||
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
|
||||
$(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
|
||||
$(DUMMYOBJ) $(OBJECTS) $(MSLU_LIBS) $(guilibsdll) shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(GL_LIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\regex$(LIBEXT).lib $(DELAY_LOAD)
|
||||
<<
|
||||
|
||||
!endif
|
||||
|
@ -44,7 +44,7 @@
|
||||
$project{"WXMSWHEADERS"} .= $file . " "
|
||||
}
|
||||
|
||||
$project{"WXVERSION"} = "233";
|
||||
$project{"WXVERSION"} = "250";
|
||||
#$}
|
||||
# Microsoft Developer Studio Project File - Name="wxBase" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
|
@ -60,7 +60,7 @@
|
||||
$project{"WXHTMLHEADERS"} .= $file . " "
|
||||
}
|
||||
|
||||
$project{"WXVERSION"} = "233";
|
||||
$project{"WXVERSION"} = "250";
|
||||
#$}
|
||||
# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
|
@ -35,7 +35,7 @@ PERIPH_CLEAN_TARGET=
|
||||
# Set to 0 if not using GLCanvas (only affects DLL build)
|
||||
USE_GLCANVAS=1
|
||||
|
||||
# Set to 0 if you are using MSVC 5
|
||||
# Set to 1 if you are using MSVC 5
|
||||
USE_MSVC_5=0
|
||||
|
||||
# These are absolute paths, so that the compiler
|
||||
|
Loading…
Reference in New Issue
Block a user