regenerated after adding DEBUG_ options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -12,8 +12,20 @@ | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| ZIP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\zip.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4)  /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.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS) | ||||
| LIBDIRNAME = \ | ||||
| 	.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| OBJS = \ | ||||
| 	vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| ZIP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ | ||||
| 	$(__DEBUGINFO_0) /Fd$(OBJS)\zip.pdb $(____DEBUGRUNTIME_2_p) \ | ||||
| 	$(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ | ||||
| 	$(__UNICODE_DEFINE_p) /I.\..\..\..\include /I$(LIBDIRNAME) \ | ||||
| 	/I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png \ | ||||
| 	/I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. \ | ||||
| 	$(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS) | ||||
| ZIP_OBJECTS =  \ | ||||
| 	$(OBJS)\zip_zip.obj \ | ||||
| 	$(OBJS)\zip_zip.res | ||||
|  | ||||
| ### Conditionally set variables: ### | ||||
|  | ||||
| @@ -23,7 +35,10 @@ PORTNAME = base | ||||
| !if "$(USE_GUI)" == "1" | ||||
| PORTNAME = msw | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | ||||
| WXDEBUGFLAG = d | ||||
| !endif | ||||
| !if "$(DEBUG_FLAG)" == "1" | ||||
| WXDEBUGFLAG = d | ||||
| !endif | ||||
| !if "$(SHARED)" == "1" | ||||
| @@ -35,35 +50,77 @@ WXUNICODEFLAG = u | ||||
| !if "$(WXUNIV)" == "1" | ||||
| WXUNIVNAME = univ | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __DEBUGFLAG_0 = /Zi | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO_0 = /Zi | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" | ||||
| __DEBUGFLAG_0 =  | ||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO_0 =  | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __DEBUGFLAG_1 = /DEBUG | ||||
| !if "$(DEBUG_INFO)" == "0" | ||||
| __DEBUGINFO_0 =  | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" | ||||
| __DEBUGFLAG_1 =  | ||||
| !if "$(DEBUG_INFO)" == "1" | ||||
| __DEBUGINFO_0 = /Zi | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __DEBUGFLAG_2 = d | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO_1 = /DEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" | ||||
| __DEBUGFLAG_2 =  | ||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO_1 =  | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| !if "$(DEBUG_INFO)" == "0" | ||||
| __DEBUGINFO_1 =  | ||||
| !endif | ||||
| !if "$(DEBUG_INFO)" == "1" | ||||
| __DEBUGINFO_1 = /DEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO_3 = d | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO_3 =  | ||||
| !endif | ||||
| !if "$(DEBUG_INFO)" == "0" | ||||
| __DEBUGINFO_3 =  | ||||
| !endif | ||||
| !if "$(DEBUG_INFO)" == "1" | ||||
| __DEBUGINFO_3 = d | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "0" | ||||
| __DEBUGRUNTIME_3 =  | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||
| __DEBUGRUNTIME_3 = d | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||
| __DEBUGRUNTIME_3 = $(__DEBUGINFO_3) | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | ||||
| __DEBUG_DEFINE_p = /D__WXDEBUG__ | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __DEBUG_DEFINE_p_1 = /d__WXDEBUG__ | ||||
| !if "$(DEBUG_FLAG)" == "1" | ||||
| __DEBUG_DEFINE_p = /D__WXDEBUG__ | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | ||||
| __DEBUG_DEFINE_p_1 = /d __WXDEBUG__ | ||||
| !endif | ||||
| !if "$(DEBUG_FLAG)" == "1" | ||||
| __DEBUG_DEFINE_p_1 = /d __WXDEBUG__ | ||||
| !endif | ||||
| !if "$(SHARED)" == "1" | ||||
| __DLLFLAG_p = /DWXUSINGDLL | ||||
| !endif | ||||
| !if "$(SHARED)" == "1" | ||||
| __DLLFLAG_p_1 = /dWXUSINGDLL | ||||
| __DLLFLAG_p_1 = /d WXUSINGDLL | ||||
| !endif | ||||
| !if "$(USE_GUI)" == "1" | ||||
| __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| !if "$(USE_GUI)" == "1" | ||||
| __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| !if "$(USE_GUI)" == "1" | ||||
| __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __OPTIMIZEFLAG_4 = /Od | ||||
| @@ -81,37 +138,70 @@ __RUNTIME_LIBS_7 = T | ||||
| __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1 | ||||
| !endif | ||||
| !if "$(UNICODE)" == "1" | ||||
| __UNICODE_DEFINE_p_1 = /dwxUSE_UNICODE=1 | ||||
| __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1 | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "0" | ||||
| __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "0" | ||||
| __WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib | ||||
| __WXLIB_CORE_p = \ | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "0" | ||||
| __WXLIB_HTML_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib | ||||
| __WXLIB_HTML_p = \ | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "1" | ||||
| __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| __WXLIB_MONO_p = \ | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| !if "$(WXUNIV)" == "1" | ||||
| __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ | ||||
| !endif | ||||
| !if "$(WXUNIV)" == "1" | ||||
| __WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__ | ||||
| __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__ | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| ____DEBUGFLAG_3_p = /D_DEBUG | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||
| ____DEBUGINFO_2_p = /D_DEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" | ||||
| ____DEBUGFLAG_3_p = /DNDEBUG | ||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||
| ____DEBUGINFO_2_p = /DNDEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| ____DEBUGFLAG_3_p_1 = /d_DEBUG | ||||
| !if "$(DEBUG_INFO)" == "0" | ||||
| ____DEBUGINFO_2_p = /DNDEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" | ||||
| ____DEBUGFLAG_3_p_1 = /dNDEBUG | ||||
| !if "$(DEBUG_INFO)" == "1" | ||||
| ____DEBUGINFO_2_p = /D_DEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||
| ____DEBUGINFO_2_p_1 = /d _DEBUG | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||
| ____DEBUGINFO_2_p_1 = /d NDEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_INFO)" == "0" | ||||
| ____DEBUGINFO_2_p_1 = /d NDEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_INFO)" == "1" | ||||
| ____DEBUGINFO_2_p_1 = /d _DEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "0" | ||||
| ____DEBUGRUNTIME_2_p = /DNDEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||
| ____DEBUGRUNTIME_2_p = /D_DEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||
| ____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "0" | ||||
| ____DEBUGRUNTIME_2_p_1 = /d NDEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "1" | ||||
| ____DEBUGRUNTIME_2_p_1 = /d _DEBUG | ||||
| !endif | ||||
| !if "$(DEBUG_RUNTIME_LIBS)" == "default" | ||||
| ____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1) | ||||
| !endif | ||||
|  | ||||
|  | ||||
| @@ -127,7 +217,7 @@ $(OBJS)\zip_zip.obj: .\zip.cpp | ||||
| 	$(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) $** | ||||
|  | ||||
| $(OBJS)\zip_zip.res: .\zip.rc | ||||
| 	rc /fo$@ /dWIN32 $(____DEBUGFLAG_3_p_1) /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /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.\..\..\..\src\expat\lib /i. $(__DLLFLAG_p_1) /d_WINDOWS $** | ||||
| 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\src\tiff /i .\..\..\..\src\jpeg /i .\..\..\..\src\png /i .\..\..\..\src\zlib  /i .\..\..\..\src\regex /i .\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS $** | ||||
|  | ||||
| clean:  | ||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||
| @@ -138,7 +228,7 @@ data: | ||||
| 	if not exist $(OBJS) mkdir $(OBJS) | ||||
| 	for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) | ||||
|  | ||||
| $(OBJS)\zip.exe: $(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res | ||||
| 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS  @<< | ||||
| 	$(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res  $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(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 | ||||
| $(OBJS)\zip.exe: $(ZIP_OBJECTS) $(OBJS)\zip_zip.res | ||||
| 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<< | ||||
| 	$(ZIP_OBJECTS)  $(__WXLIB_HTML_p) $(__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  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 | ||||
| << | ||||
|   | ||||
		Reference in New Issue
	
	Block a user