Regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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!
|
||||
# =========================================================================
|
||||
|
||||
@@ -55,6 +55,13 @@ 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 =
|
||||
@@ -141,7 +148,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
|
||||
@@ -160,13 +174,6 @@ __UNICODE_DEFINE_p =
|
||||
!ifeq UNICODE 1
|
||||
__UNICODE_DEFINE_p = -d_UNICODE
|
||||
!endif
|
||||
LIBDIRNAME =
|
||||
!ifeq SHARED 0
|
||||
LIBDIRNAME = .\..\..\lib\wat_lib$(CFG)
|
||||
!endif
|
||||
!ifeq SHARED 1
|
||||
LIBDIRNAME = .\..\..\lib\wat_dll$(CFG)
|
||||
!endif
|
||||
__DLLFLAG_p =
|
||||
!ifeq SHARED 1
|
||||
__DLLFLAG_p = -dWXUSINGDLL
|
||||
@@ -202,22 +209,24 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
|
||||
### 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 = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -i=. &
|
||||
$(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
|
||||
$(CXXFLAGS)
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
|
||||
$(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG) &
|
||||
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
RENDER_OBJECTS = &
|
||||
$(OBJS)\render_render.obj
|
||||
RENDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
|
||||
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -dWXUSINGDLL &
|
||||
$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
|
||||
-i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
|
||||
-dWXUSINGDLL $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) &
|
||||
$(CXXFLAGS)
|
||||
RENDDLL_OBJECTS = &
|
||||
$(OBJS)\renddll_renddll.obj
|
||||
|
||||
@@ -235,6 +244,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 $(OBJS)\render.exe del $(OBJS)\render.exe
|
||||
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_wat.dll
|
||||
|
||||
@@ -264,10 +274,11 @@ $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(WX_VERSION_NODOT)_wat.d
|
||||
!endif
|
||||
|
||||
$(OBJS)\render_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
|
||||
|
||||
$(OBJS)\render_render.obj : .AUTODEPEND .\render.cpp
|
||||
$(CXX) -zq -fo=$^@ $(RENDER_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\renddll_renddll.obj : .AUTODEPEND .\renddll.cpp
|
||||
$(CXX) -zq -fo=$^@ $(RENDDLL_CXXFLAGS) $<
|
||||
|
||||
|
Reference in New Issue
Block a user