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:
		| @@ -32,10 +32,14 @@ top_srcdir = @top_srcdir@ | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| LIBDIRNAME = $(top_builddir)lib | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ | ||||
| 	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \ | ||||
| 	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \ | ||||
| 	-I$(srcdir) $(__DLLFLAG_p) $(CXXFLAGS) | ||||
| VIRTUAL_OBJECTS =  \ | ||||
| 	virtual_virtual.o \ | ||||
| 	$(__virtual___win32rc) | ||||
|  | ||||
| ### Conditionally set variables: ### | ||||
|  | ||||
| @@ -44,7 +48,8 @@ VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ | ||||
| @COND_USE_GUI_0@PORTNAME = base | ||||
| @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) | ||||
| @COND_TOOLKIT_MAC@WXBASEPORT = _carbon | ||||
| @COND_BUILD_DEBUG@WXDEBUGFLAG = d | ||||
| @COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d | ||||
| @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d | ||||
| @COND_UNICODE_1@WXUNICODEFLAG = u | ||||
| @COND_WXUNIV_1@WXUNIVNAME = univ | ||||
| @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL | ||||
| @@ -80,34 +85,39 @@ VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ | ||||
| @COND_WXUSE_ZLIB_BUILTIN@	--include-dir $(top_srcdir)/src/zlib | ||||
| @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \ | ||||
| @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = \ | ||||
| @COND_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	= \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@	-lwxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \ | ||||
| @COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = \ | ||||
| @COND_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	= \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@	-lwxpng$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \ | ||||
| @COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = \ | ||||
| @COND_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \ | ||||
| @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	-lwxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ | ||||
| @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) | ||||
| @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(RESCOMP) -d \ | ||||
| @COND_TOOLKIT_MAC@	__DARWIN__ -t APPL -d __WX$(TOOLKIT)__ \ | ||||
| @COND_TOOLKIT_MAC@	$(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ | ||||
| @COND_TOOLKIT_MAC@	$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) \ | ||||
| @COND_TOOLKIT_MAC@	$(__INC_ZLIB_p_1) $(__INC_ODBC_p_1) $(__INC_REGEX_p_1) \ | ||||
| @COND_TOOLKIT_MAC@	$(__INC_EXPAT_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -o \ | ||||
| @COND_TOOLKIT_MAC@	virtual$(EXEEXT) Carbon.r \ | ||||
| @COND_TOOLKIT_MAC@	$(top_builddir)lib/libwx_$(TOOLCHAIN_NAME).0.r | ||||
| COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ | ||||
| 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \ | ||||
| 	$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \ | ||||
| 	$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \ | ||||
| 	$(__DLLFLAG_p_1) -o virtual$(EXEEXT) Carbon.r \ | ||||
| 	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r | ||||
| @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) | ||||
| @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ | ||||
| @COND_MONOLITHIC_0@	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_0@__WXLIB_CORE_p = \ | ||||
| @COND_MONOLITHIC_0@	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_0@__WXLIB_HTML_p = \ | ||||
| @COND_MONOLITHIC_0@	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_1@__WXLIB_MONO_p = \ | ||||
| @COND_MONOLITHIC_1@	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) | ||||
| COND_MONOLITHIC_0___WXLIB_CORE_p = \ | ||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) | ||||
| COND_MONOLITHIC_0___WXLIB_HTML_p = \ | ||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p) | ||||
| COND_MONOLITHIC_1___WXLIB_MONO_p = \ | ||||
| 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) | ||||
| @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p) | ||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ | ||||
| @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ | ||||
| @@ -122,7 +132,7 @@ all: virtual$(EXEEXT) data | ||||
|  | ||||
| clean:  | ||||
| 	rm -rf ./.deps | ||||
| 	rm -f -f ./*.o | ||||
| 	rm -f ./*.o | ||||
| 	rm -f virtual$(EXEEXT) | ||||
|  | ||||
| data:  | ||||
| @@ -143,8 +153,8 @@ install-strip: install | ||||
|  | ||||
| uninstall:  | ||||
|  | ||||
| virtual$(EXEEXT): virtual_virtual.o $(__virtual___win32rc) | ||||
| 	$(CXX) -o $@  virtual_virtual.o $(__virtual___win32rc) $(LDFLAGS)   -L$(top_builddir)lib $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) | ||||
| virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc) | ||||
| 	$(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) | ||||
| 	$(__virtual___mac_rezcmd) | ||||
| 	$(__virtual___mac_setfilecmd) | ||||
|  | ||||
|   | ||||
| @@ -20,15 +20,18 @@ BCCDIR = $(MAKEDIR)\.. | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| LIBDIRNAME = \ | ||||
| 	.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| OBJS = \ | ||||
| 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \ | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ | ||||
| 	$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||||
| 	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \ | ||||
| 	-I.\..\..\..\lib\bcc_$(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) $(CXXFLAGS) | ||||
| 	-I$(LIBDIRNAME) -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg \ | ||||
| 	-I.\..\..\..\src\png -I.\..\..\..\src\zlib -I.\..\..\..\src\regex \ | ||||
| 	-I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS) | ||||
| VIRTUAL_OBJECTS =  \ | ||||
| 	$(OBJS)\virtual_virtual.obj | ||||
|  | ||||
| ### Conditionally set variables: ### | ||||
|  | ||||
| @@ -38,7 +41,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" | ||||
| @@ -50,16 +56,28 @@ WXUNICODEFLAG = u | ||||
| !if "$(WXUNIV)" == "1" | ||||
| WXUNIVNAME = univ | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| __DEBUGFLAG = -v | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO = -v | ||||
| !endif | ||||
| !if "$(BUILD)" == "release" | ||||
| __DEBUGFLAG = -v- | ||||
| !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" | ||||
| __DEBUGINFO = -v- | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| !if "$(DEBUG_INFO)" == "0" | ||||
| __DEBUGINFO = -v- | ||||
| !endif | ||||
| !if "$(DEBUG_INFO)" == "1" | ||||
| __DEBUGINFO = -v | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" | ||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ | ||||
| !endif | ||||
| !if "$(BUILD)" == "debug" | ||||
| !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" | ||||
| @@ -68,6 +86,15 @@ __DLLFLAG_p = -DWXUSINGDLL | ||||
| !if "$(SHARED)" == "1" | ||||
| __DLLFLAG_p_1 = -dWXUSINGDLL | ||||
| !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_2 = -Od | ||||
| !endif | ||||
| @@ -127,7 +154,7 @@ $(OBJS)\virtual_virtual.obj: .\virtual.cpp | ||||
| 	$(CXX) -q -c -P -o$@ $(VIRTUAL_CXXFLAGS) $** | ||||
|  | ||||
| $(OBJS)\virtual_virtual.res: .\virtual.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.\..\..\..\lib\bcc_$(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) $** | ||||
| 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -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) $** | ||||
|  | ||||
| clean:  | ||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||
| @@ -138,7 +165,7 @@ data: | ||||
| 	if not exist $(OBJS) mkdir $(OBJS) | ||||
| 	for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) | ||||
|  | ||||
| $(OBJS)\virtual.exe: $(OBJS)\virtual_virtual.obj  $(OBJS)\virtual_virtual.res | ||||
| 	ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG)  -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -aa  @&&| | ||||
| 	c0w32.obj  $(OBJS)\virtual_virtual.obj,$@,, $(__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  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\virtual_virtual.res | ||||
| $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS)  $(OBJS)\virtual_virtual.res | ||||
| 	ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&| | ||||
| 	c0w32.obj $(VIRTUAL_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  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\virtual_virtual.res | ||||
| | | ||||
|   | ||||
| @@ -12,8 +12,19 @@ include ../../../build/config.gcc | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include -I.\..\..\..\lib\gcc_$(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) $(CXXFLAGS) | ||||
| LIBDIRNAME = \ | ||||
| 	.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| OBJS = \ | ||||
| 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ | ||||
| 	-DHAVE_W32API_H -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) $(CXXFLAGS) | ||||
| VIRTUAL_OBJECTS =  \ | ||||
| 	$(OBJS)\virtual_virtual.o \ | ||||
| 	$(OBJS)\virtual_virtual_rc.o | ||||
|  | ||||
| ### Conditionally set variables: ### | ||||
|  | ||||
| @@ -27,6 +38,11 @@ ifeq ($(USE_GUI),1) | ||||
| PORTNAME = msw | ||||
| endif | ||||
| ifeq ($(BUILD),debug) | ||||
| ifeq ($(DEBUG_FLAG),default) | ||||
| WXDEBUGFLAG = d | ||||
| endif | ||||
| endif | ||||
| ifeq ($(DEBUG_FLAG),1) | ||||
| WXDEBUGFLAG = d | ||||
| endif | ||||
| ifeq ($(SHARED),1) | ||||
| @@ -39,15 +55,35 @@ ifeq ($(WXUNIV),1) | ||||
| WXUNIVNAME = univ | ||||
| endif | ||||
| ifeq ($(BUILD),debug) | ||||
| __DEBUGFLAG = -g | ||||
| ifeq ($(DEBUG_INFO),default) | ||||
| __DEBUGINFO = -g | ||||
| endif | ||||
| endif | ||||
| ifeq ($(BUILD),release) | ||||
| __DEBUGFLAG =  | ||||
| ifeq ($(DEBUG_INFO),default) | ||||
| __DEBUGINFO =  | ||||
| endif | ||||
| endif | ||||
| ifeq ($(DEBUG_INFO),0) | ||||
| __DEBUGINFO =  | ||||
| endif | ||||
| ifeq ($(DEBUG_INFO),1) | ||||
| __DEBUGINFO = -g | ||||
| endif | ||||
| ifeq ($(BUILD),debug) | ||||
| ifeq ($(DEBUG_FLAG),default) | ||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ | ||||
| endif | ||||
| endif | ||||
| ifeq ($(DEBUG_FLAG),1) | ||||
| __DEBUG_DEFINE_p = -D__WXDEBUG__ | ||||
| endif | ||||
| ifeq ($(BUILD),debug) | ||||
| ifeq ($(DEBUG_FLAG),default) | ||||
| __DEBUG_DEFINE_p_1 = --define __WXDEBUG__ | ||||
| endif | ||||
| endif | ||||
| ifeq ($(DEBUG_FLAG),1) | ||||
| __DEBUG_DEFINE_p_1 = --define __WXDEBUG__ | ||||
| endif | ||||
| ifeq ($(SHARED),1) | ||||
| @@ -56,6 +92,15 @@ endif | ||||
| ifeq ($(SHARED),1) | ||||
| __DLLFLAG_p_1 = --define WXUSINGDLL | ||||
| endif | ||||
| ifeq ($(USE_GUI),1) | ||||
| __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(USE_GUI),1) | ||||
| __LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(USE_GUI),1) | ||||
| __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(BUILD),debug) | ||||
| __OPTIMIZEFLAG_2 = -O0 | ||||
| endif | ||||
| @@ -72,13 +117,16 @@ ifeq ($(MONOLITHIC),0) | ||||
| __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(MONOLITHIC),0) | ||||
| __WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core | ||||
| __WXLIB_CORE_p = \ | ||||
| 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core | ||||
| endif | ||||
| ifeq ($(MONOLITHIC),0) | ||||
| __WXLIB_HTML_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html | ||||
| __WXLIB_HTML_p = \ | ||||
| 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html | ||||
| endif | ||||
| ifeq ($(MONOLITHIC),1) | ||||
| __WXLIB_MONO_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| __WXLIB_MONO_p = \ | ||||
| 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| endif | ||||
| ifeq ($(WXUNIV),1) | ||||
| __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ | ||||
| @@ -100,7 +148,7 @@ $(OBJS)\virtual_virtual.o: .\virtual.cpp | ||||
| 	$(CXX) -c -o $@ $(VIRTUAL_CXXFLAGS) $< | ||||
|  | ||||
| $(OBJS)\virtual_virtual_rc.o: .\virtual.rc | ||||
| 	windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir ./../../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) | ||||
| 	windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../include --include-dir $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib  --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) | ||||
|  | ||||
| clean:  | ||||
| 	-if exist $(OBJS)\*.o del $(OBJS)\*.o | ||||
| @@ -110,7 +158,7 @@ data: | ||||
| 	if not exist $(OBJS) mkdir $(OBJS) | ||||
| 	for %%f in (start.htm) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) | ||||
|  | ||||
| $(OBJS)\virtual.exe: $(OBJS)\virtual_virtual.o $(OBJS)\virtual_virtual_rc.o | ||||
| 	$(CXX) -o $@  $(OBJS)\virtual_virtual.o $(OBJS)\virtual_virtual_rc.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -Wl,--subsystem,windows -mwindows   $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 | ||||
| $(OBJS)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual_rc.o | ||||
| 	$(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 | ||||
|  | ||||
| .PHONY: all clean | ||||
|   | ||||
| @@ -12,8 +12,20 @@ | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\virtual.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) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \ | ||||
| 	/DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\virtual.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) | ||||
| VIRTUAL_OBJECTS =  \ | ||||
| 	$(OBJS)\virtual_virtual.obj \ | ||||
| 	$(OBJS)\virtual_virtual.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)\virtual_virtual.obj: .\virtual.cpp | ||||
| 	$(CXX) /c /nologo /TP /Fo$@ $(VIRTUAL_CXXFLAGS) $** | ||||
|  | ||||
| $(OBJS)\virtual_virtual.res: .\virtual.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 (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) | ||||
|  | ||||
| $(OBJS)\virtual.exe: $(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.res | ||||
| 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS  @<< | ||||
| 	$(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.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)\virtual.exe: $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res | ||||
| 	link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<< | ||||
| 	$(VIRTUAL_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 | ||||
| << | ||||
|   | ||||
| @@ -36,6 +36,11 @@ PORTNAME = msw | ||||
| !endif | ||||
| WXDEBUGFLAG = | ||||
| !ifeq BUILD debug | ||||
| !ifeq DEBUG_FLAG default | ||||
| WXDEBUGFLAG = d | ||||
| !endif | ||||
| !endif | ||||
| !ifeq DEBUG_FLAG 1 | ||||
| WXDEBUGFLAG = d | ||||
| !endif | ||||
| WXDLLFLAG = | ||||
| @@ -50,28 +55,65 @@ WXUNIVNAME = | ||||
| !ifeq WXUNIV 1 | ||||
| WXUNIVNAME = univ | ||||
| !endif | ||||
| __DEBUGFLAG_0 = | ||||
| __DEBUGINFO_0 = | ||||
| !ifeq BUILD debug | ||||
| __DEBUGFLAG_0 = -d2 | ||||
| !ifeq DEBUG_INFO default | ||||
| __DEBUGINFO_0 = -d2 | ||||
| !endif | ||||
| !endif | ||||
| !ifeq BUILD release | ||||
| __DEBUGFLAG_0 = -d0 | ||||
| !ifeq DEBUG_INFO default | ||||
| __DEBUGINFO_0 = -d0 | ||||
| !endif | ||||
| __DEBUGFLAG_1 = | ||||
| !endif | ||||
| !ifeq DEBUG_INFO 0 | ||||
| __DEBUGINFO_0 = -d0 | ||||
| !endif | ||||
| !ifeq DEBUG_INFO 1 | ||||
| __DEBUGINFO_0 = -d2 | ||||
| !endif | ||||
| __DEBUGINFO_1 = | ||||
| !ifeq BUILD debug | ||||
| __DEBUGFLAG_1 = debug all | ||||
| !ifeq DEBUG_INFO default | ||||
| __DEBUGINFO_1 = debug all | ||||
| !endif | ||||
| !endif | ||||
| !ifeq BUILD release | ||||
| __DEBUGFLAG_1 =  | ||||
| !ifeq DEBUG_INFO default | ||||
| __DEBUGINFO_1 =  | ||||
| !endif | ||||
| !endif | ||||
| !ifeq DEBUG_INFO 0 | ||||
| __DEBUGINFO_1 =  | ||||
| !endif | ||||
| !ifeq DEBUG_INFO 1 | ||||
| __DEBUGINFO_1 = debug all | ||||
| !endif | ||||
| __DEBUG_DEFINE_p = | ||||
| !ifeq BUILD debug | ||||
| !ifeq DEBUG_FLAG default | ||||
| __DEBUG_DEFINE_p = -d__WXDEBUG__ | ||||
| !endif | ||||
| !endif | ||||
| !ifeq DEBUG_FLAG 1 | ||||
| __DEBUG_DEFINE_p = -d__WXDEBUG__ | ||||
| !endif | ||||
| __DLLFLAG_p = | ||||
| !ifeq SHARED 1 | ||||
| __DLLFLAG_p = -dWXUSINGDLL | ||||
| !endif | ||||
| __LIB_JPEG_p = | ||||
| !ifeq USE_GUI 1 | ||||
| __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| __LIB_PNG_p = | ||||
| !ifeq USE_GUI 1 | ||||
| __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| __LIB_TIFF_p = | ||||
| !ifeq USE_GUI 1 | ||||
| __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| __OPTIMIZEFLAG_2 = | ||||
| !ifeq BUILD debug | ||||
| __OPTIMIZEFLAG_2 = -od | ||||
| @@ -96,15 +138,18 @@ __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| __WXLIB_CORE_p = | ||||
| !ifeq 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 | ||||
| __WXLIB_HTML_p = | ||||
| !ifeq 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 | ||||
| __WXLIB_MONO_p = | ||||
| !ifeq MONOLITHIC 1 | ||||
| __WXLIB_MONO_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| __WXLIB_MONO_p = & | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| !endif | ||||
| __WXUNIV_DEFINE_p = | ||||
| !ifeq WXUNIV 1 | ||||
| @@ -113,8 +158,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5)  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(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) $(CXXFLAGS)  | ||||
| LIBDIRNAME = & | ||||
| 	.\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| OBJS = & | ||||
| 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| VIRTUAL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & | ||||
| 	$(__RUNTIME_LIBS_5) -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) $(CXXFLAGS) | ||||
| VIRTUAL_OBJECTS =  & | ||||
| 	$(OBJS)\virtual_virtual.obj | ||||
|  | ||||
|  | ||||
|  | ||||
| @@ -130,7 +185,7 @@ $(OBJS)\virtual_virtual.obj :  .AUTODEPEND .\virtual.cpp | ||||
| 	$(CXX) -zq -fo=$^@ $(VIRTUAL_CXXFLAGS) $< | ||||
|  | ||||
| $(OBJS)\virtual_virtual.res :  .AUTODEPEND .\virtual.rc | ||||
| 	wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=.\..\..\..\lib\wat_$(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) $< | ||||
| 	wrc -q -ad -bt=nt -r -fo=$^@ -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) $< | ||||
|  | ||||
| clean : .SYMBOLIC  | ||||
| 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj | ||||
| @@ -143,13 +198,13 @@ data : | ||||
| 	if not exist $(OBJS) mkdir $(OBJS) | ||||
| 	for %f in (start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS) | ||||
|  | ||||
| $(OBJS)\virtual.exe :  $(OBJS)\virtual_virtual.obj $(OBJS)\virtual_virtual.res | ||||
| $(OBJS)\virtual.exe :  $(VIRTUAL_OBJECTS) $(OBJS)\virtual_virtual.res | ||||
| 	@%create $(OBJS)\virtual.lbc | ||||
| 	@%append $(OBJS)\virtual.lbc option quiet | ||||
| 	@%append $(OBJS)\virtual.lbc name $^@ | ||||
| 	@%append $(OBJS)\virtual.lbc option incremental | ||||
| 	@%append $(OBJS)\virtual.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) system nt_win ref '_WinMain@16' | ||||
| 	@for %i in ( $(OBJS)\virtual_virtual.obj) do @%append $(OBJS)\virtual.lbc file %i | ||||
| 	@for %i in ( $(__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 ) do @%append $(OBJS)\virtual.lbc library %i | ||||
| 	@%append $(OBJS)\virtual.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' | ||||
| 	@for %i in ($(VIRTUAL_OBJECTS)) do @%append $(OBJS)\virtual.lbc file %i | ||||
| 	@for %i in ( $(__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 ) do @%append $(OBJS)\virtual.lbc library %i | ||||
| 	@%append $(OBJS)\virtual.lbc option resource=$(OBJS)\virtual_virtual.res | ||||
| 	wlink @$(OBJS)\virtual.lbc | ||||
|   | ||||
		Reference in New Issue
	
	Block a user