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.5 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.5
|
||||
WX_VERSION = $(WX_RELEASE).3
|
||||
WX_VERSION = $(WX_RELEASE).4
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
POPUP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
@@ -110,7 +110,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../samples -i $(top_srcdir)/include -o popup$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
|
||||
### Targets: ###
|
||||
@@ -139,7 +139,7 @@ popup$(EXEEXT): $(POPUP_OBJECTS) $(__popup___win32rc)
|
||||
$(__popup___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p popup.app/Contents
|
||||
mkdir -p popup.app/Contents/MacOS
|
||||
mkdir -p popup.app/Contents/Resources
|
||||
@@ -157,7 +157,7 @@ popup.app/Contents/PkgInfo: popup$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.pli
|
||||
ln -f popup$(EXEEXT) popup.app/Contents/MacOS/popup
|
||||
|
||||
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc popup.app/Contents/Resources/popup.rsrc
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc popup.app/Contents/Resources/popup.rsrc
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns popup.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@popup_bundle: $(____popup_BUNDLE_TGT_REF_DEP)
|
||||
@@ -166,7 +166,7 @@ popup_popup.o: $(srcdir)/popup.cpp
|
||||
$(CXXC) -c -o $@ $(POPUP_CXXFLAGS) $(srcdir)/popup.cpp
|
||||
|
||||
popup_sample_rc.o: $(srcdir)/../sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.5 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -183,5 +183,5 @@ $(OBJS)\popup_popup.obj: .\popup.cpp
|
||||
$(CXX) -q -c -P -o$@ $(POPUP_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\popup_sample.res: .\..\sample.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 -dNOPCH $**
|
||||
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 -dNOPCH $**
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.5 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -13,12 +13,13 @@ include ../../build/msw/config.dmc
|
||||
### Variables: ###
|
||||
|
||||
WX_RELEASE_NODOT = 25
|
||||
OBJS = dmc_msw$(CFG)
|
||||
OBJS = dmc_mswd$(CFG)
|
||||
LIBTYPE_SUFFIX = lib
|
||||
LIBDIRNAME = .\..\..\lib\dmc_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = $(LIBDIRNAME)\msw
|
||||
POPUP_CXXFLAGS = -o -D__WXMSW__ -I.\..\..\include -I$(SETUPHDIR) -w- -I. -WA \
|
||||
-I.\..\..\samples -DNOPCH -Ar -Ae $(CPPFLAGS) $(CXXFLAGS)
|
||||
SETUPHDIR = $(LIBDIRNAME)\mswd
|
||||
POPUP_CXXFLAGS = -g -o+none -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ \
|
||||
-I.\..\..\include -I$(SETUPHDIR) -w- -I. -WA -I.\..\..\samples -DNOPCH -Ar -Ae \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
POPUP_OBJECTS = \
|
||||
$(OBJS)\popup_popup.obj
|
||||
|
||||
@@ -34,11 +35,11 @@ clean :
|
||||
-if exist $(OBJS)\popup.map del $(OBJS)\popup.map
|
||||
|
||||
$(OBJS)\popup.exe : $(POPUP_OBJECTS) $(OBJS)\popup_sample.res
|
||||
link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) /su:windows:4.0 $(POPUP_OBJECTS),$@,$(OBJS)\popup.map, $(LIBDIRNAME)\ wxmsw$(WX_RELEASE_NODOT)$(WX_LIB_FLAVOUR)_core.lib wxbase$(WX_RELEASE_NODOT)$(WX_LIB_FLAVOUR).lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 ,, $(OBJS)\popup_sample.res
|
||||
link /NOLOGO /SILENT /NOI /DELEXECUTABLE /EXETYPE:NT $(LDFLAGS) /DEBUG /CODEVIEW /su:windows:4.0 $(POPUP_OBJECTS),$@,$(OBJS)\popup.map, $(LIBDIRNAME)\ wxmsw$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR)_core.lib wxbase$(WX_RELEASE_NODOT)d$(WX_LIB_FLAVOUR).lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 ,, $(OBJS)\popup_sample.res
|
||||
|
||||
$(OBJS)\popup_popup.obj : .\popup.cpp
|
||||
$(CXX) -mn -c -o$@ $(POPUP_CXXFLAGS) .\popup.cpp
|
||||
|
||||
$(OBJS)\popup_sample.res : .\..\sample.rc
|
||||
rcc $** -o$@ -D__WXMSW__ -I.\..\..\include -I$(SETUPHDIR) -I. -I.\..\..\samples -DNOPCH -32 -v-
|
||||
rcc $** -o$@ -D_WIN32_WINNT=0x0400 -D__WXMSW__ -D__WXDEBUG__ -I.\..\..\include -I$(SETUPHDIR) -I. -I.\..\..\samples -DNOPCH -32 -v-
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.5 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -180,7 +180,7 @@ $(OBJS)\popup_popup.o: ./popup.cpp
|
||||
$(CXX) -c -o $@ $(POPUP_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\popup_sample_rc.o: ./../sample.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 $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
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 $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.5 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -267,5 +267,5 @@ $(OBJS)\popup_popup.obj: .\popup.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(POPUP_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\popup_sample.res: .\..\sample.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH $**
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.5 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -228,5 +228,5 @@ $(OBJS)\popup_popup.obj : .AUTODEPEND .\popup.cpp
|
||||
$(CXX) -zq -fo=$^@ $(POPUP_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\popup_sample.res : .AUTODEPEND .\..\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 -dNOPCH $<
|
||||
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 -dNOPCH $<
|
||||
|
||||
|
Reference in New Issue
Block a user