Updated makefiles etc. for 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -118,10 +118,10 @@ __RUNTIME_LIBS_7 = i
 | 
			
		||||
__RUNTIME_LIBS_7 = 
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(UNICODE)" == "1"
 | 
			
		||||
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 | 
			
		||||
__UNICODE_DEFINE_p = -D_UNICODE
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(UNICODE)" == "1"
 | 
			
		||||
__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 | 
			
		||||
__UNICODE_DEFINE_p_1 = -d_UNICODE
 | 
			
		||||
!endif
 | 
			
		||||
!if "$(MSLU)" == "1"
 | 
			
		||||
__UNICOWS_LIB_p = unicows.lib
 | 
			
		||||
@@ -157,14 +157,19 @@ $(OBJS)\thread_thread.obj: .\thread.cpp
 | 
			
		||||
	$(CXX) -q -c -P -o$@ $(THREAD_CXXFLAGS) $**
 | 
			
		||||
 | 
			
		||||
$(OBJS)\thread_thread.res: .\thread.rc
 | 
			
		||||
	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 | 
			
		||||
	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 | 
			
		||||
 | 
			
		||||
clean: 
 | 
			
		||||
	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
 | 
			
		||||
	-if exist $(OBJS)\*.res del $(OBJS)\*.res
 | 
			
		||||
	-if exist $(OBJS)\thread.exe del $(OBJS)\thread.exe
 | 
			
		||||
	-if exist $(OBJS)\thread.tds del $(OBJS)\thread.tds
 | 
			
		||||
	-if exist $(OBJS)\thread.ilc del $(OBJS)\thread.ilc
 | 
			
		||||
	-if exist $(OBJS)\thread.ild del $(OBJS)\thread.ild
 | 
			
		||||
	-if exist $(OBJS)\thread.ilf del $(OBJS)\thread.ilf
 | 
			
		||||
	-if exist $(OBJS)\thread.ils del $(OBJS)\thread.ils
 | 
			
		||||
 | 
			
		||||
$(OBJS)\thread.exe: $(THREAD_OBJECTS)  $(OBJS)\thread_thread.res
 | 
			
		||||
	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
 | 
			
		||||
	c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\thread_thread.res
 | 
			
		||||
	c0w32.obj $(THREAD_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\thread_thread.res
 | 
			
		||||
|
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user