X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c2d002b3e7099cd142a15593391774effdcbf2c..29b53ef977fd6c50da7915a659ed2e81a6e3c9bc:/contrib/build/net/makefile.wat diff --git a/contrib/build/net/makefile.wat b/contrib/build/net/makefile.wat index e300dd1921..073aceaec8 100644 --- a/contrib/build/net/makefile.wat +++ b/contrib/build/net/makefile.wat @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.4 (http://bakefile.sourceforge.net) +# Bakefile 0.1.6 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -62,6 +62,20 @@ WXDLLFLAG = !ifeq SHARED 1 WXDLLFLAG = dll !endif +LIBTYPE_SUFFIX = +!ifeq SHARED 0 +LIBTYPE_SUFFIX = lib +!endif +!ifeq SHARED 1 +LIBTYPE_SUFFIX = dll +!endif +EXTRALIBS_FOR_BASE = +!ifeq MONOLITHIC 0 +EXTRALIBS_FOR_BASE = +!endif +!ifeq MONOLITHIC 1 +EXTRALIBS_FOR_BASE = +!endif __netutilsdll___depname = !ifeq SHARED 1 __netutilsdll___depname = & @@ -152,7 +166,14 @@ __EXCEPTIONSFLAG = __EXCEPTIONSFLAG = !endif !ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG = -xs +__EXCEPTIONSFLAG = -xr +!endif +__EXCEPTIONSFLAG_0 = +!ifeq USE_EXCEPTIONS 0 +__EXCEPTIONSFLAG_0 = +!endif +!ifeq USE_EXCEPTIONS 1 +__EXCEPTIONSFLAG_0 = -xs !endif __WXUNIV_DEFINE_p = !ifeq WXUNIV 1 @@ -171,28 +192,22 @@ __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -d_UNICODE !endif -LIBDIRNAME = -!ifeq SHARED 0 -LIBDIRNAME = ..\..\src\net\..\..\..\lib\wat_lib$(CFG) -!endif -!ifeq SHARED 1 -LIBDIRNAME = ..\..\src\net\..\..\..\lib\wat_dll$(CFG) -!endif ### Variables: ### WX_RELEASE_NODOT = 25 -WX_VERSION_NODOT = $(WX_RELEASE_NODOT)3 +WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4 OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) +LIBDIRNAME = ..\..\src\net\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG) SETUPHDIR = & $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) NETUTILSDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__UNICODE_DEFINE_p) -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\net\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS & - /fh=$(OBJS)\wxprec_netutilsdll.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) + $(__UNICODE_DEFINE_p) -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) -wx & + -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\net\..\..\include & + -dWXUSINGDLL -dWXMAKINGDLL_NETUTILS /fh=$(OBJS)\wxprec_netutilsdll.pch & + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) NETUTILSDLL_OBJECTS = & $(OBJS)\netutilsdll_dummy.obj & $(OBJS)\netutilsdll_email.obj & @@ -200,9 +215,10 @@ NETUTILSDLL_OBJECTS = & $(OBJS)\netutilsdll_web.obj NETUTILSLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & - -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) & - -i=..\..\src\net\..\..\include /fh=$(OBJS)\wxprec_netutilslib.pch & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) + -i=..\..\src\net\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 & + -wcd=657 -wcd=667 -i=..\..\src\net\..\..\include & + /fh=$(OBJS)\wxprec_netutilslib.pch $(__EXCEPTIONSFLAG) & + $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) NETUTILSLIB_OBJECTS = & $(OBJS)\netutilslib_dummy.obj & $(OBJS)\netutilslib_email.obj & @@ -223,6 +239,7 @@ clean : .SYMBOLIC -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk + -if exist $(OBJS)\*.pch del $(OBJS)\*.pch -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils_wat$(VENDORTAG).dll -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_netutils.lib @@ -235,7 +252,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\netutilsdll.lbc option caseexact @%append $(OBJS)\netutilsdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(NETUTILSDLL_OBJECTS)) do @%append $(OBJS)\netutilsdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\netutilsdll.lbc library %i @%append $(OBJS)\netutilsdll.lbc @%append $(OBJS)\netutilsdll.lbc system nt_dll wlink @$(OBJS)\netutilsdll.lbc @@ -272,3 +289,4 @@ $(OBJS)\netutilslib_smapi.obj : .AUTODEPEND ../../src/net\smapi.cpp $(OBJS)\netutilslib_web.obj : .AUTODEPEND ../../src/net\web.cpp $(CXX) -zq -fo=$^@ $(NETUTILSLIB_CXXFLAGS) $< +