Regenerated makefiles for 3rd-party lib change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -118,13 +118,13 @@ __WXLIB_MONO_p = \
 | 
			
		||||
	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(USE_GUI)" == "1"
 | 
			
		||||
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
 | 
			
		||||
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(USE_GUI)" == "1"
 | 
			
		||||
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
 | 
			
		||||
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(USE_GUI)" == "1"
 | 
			
		||||
__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
 | 
			
		||||
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(MSLU)" == "1"
 | 
			
		||||
__UNICOWS_LIB_p = unicows.lib
 | 
			
		||||
@@ -169,7 +169,7 @@ clean:
 | 
			
		||||
 | 
			
		||||
$(OBJS)\resource.exe: $(RESOURCE_OBJECTS)  $(OBJS)\resource_resource.res
 | 
			
		||||
	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
 | 
			
		||||
	c0w32.obj $(RESOURCE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\resource_resource.res
 | 
			
		||||
	c0w32.obj $(RESOURCE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\resource_resource.res
 | 
			
		||||
|
 | 
			
		||||
 | 
			
		||||
$(OBJS)\resource_resource.obj: .\resource.cpp
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user