X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/84955c7cabde0e59c41883fa39bef80eb0e3c482..fa10c70ceb3a08a11302c00c9f0e29941174a21b:/samples/minimal/makefile.vc

diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 997895267e..6e1b1a7f69 100644
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -42,7 +42,7 @@ WXUNIV = 0
 
 ### Variables: ###
 
-OBJS = objs_vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 MINIMAL_CXXFLAGS = $(CPPFLAGS) /MD /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I./../../include /I./../../lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I./../../src/tiff /I./../../src/jpeg /I./../../src/png /I./../../src/zlib  /I./../../src/regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
@@ -84,7 +84,7 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 __UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1
 !endif
 !if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wx25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base.lib
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
@@ -123,7 +123,7 @@ install: all
 
 $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res
 	link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
-	$(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+	$(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
 <<
 
 uninstall: