regenerated all 2.8 makefiles with bakefile-0.2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@53924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.2 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.2.3 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
datarootdir = @datarootdir@
|
||||
INSTALL = @INSTALL@
|
||||
EXEEXT = @EXEEXT@
|
||||
WINDRES = @WINDRES@
|
||||
@@ -40,7 +41,7 @@ wx_top_builddir = @wx_top_builddir@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.8
|
||||
WX_VERSION = $(WX_RELEASE).7
|
||||
WX_VERSION = $(WX_RELEASE).8
|
||||
LIBDIRNAME = $(wx_top_builddir)/lib
|
||||
PLOT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
@@ -66,6 +67,7 @@ PLOT_OBJECTS = \
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_PLATFORM_MAC_0@__plot___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__plot___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C plot$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__plot___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@@ -93,9 +95,13 @@ COND_PLATFORM_OS2_1___plot___os2_emxbindcmd = $(NM) plot$(EXEEXT) | if grep -q \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_PLATFORM_OS2_1@__plot_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__plot_app_Contents_PkgInfo___depname \
|
||||
@COND_PLATFORM_MACOSX_1@ = plot.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@__plot_bundle___depname = plot_bundle
|
||||
@COND_TOOLKIT_COCOA@____plot_BUNDLE_TGT_REF_DEP = plot.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____plot_BUNDLE_TGT_REF_DEP = plot.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_COCOA@____plot_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ $(__plot_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_MAC@____plot_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_MAC@ $(__plot_app_Contents_PkgInfo___depname)
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
@@ -157,25 +163,25 @@ plot$(EXEEXT): $(PLOT_OBJECTS) $(__plot___win32rc)
|
||||
$(__plot___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p plot.app/Contents
|
||||
mkdir -p plot.app/Contents/MacOS
|
||||
mkdir -p plot.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/plot/" \
|
||||
-e "s/VERSION/$(WX_VERSION)/" \
|
||||
$(top_srcdir)/src/mac/carbon/Info.plist.in >plot.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >plot.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot
|
||||
|
||||
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns plot.app/Contents/Resources/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1@plot.app/Contents/PkgInfo: plot$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p plot.app/Contents
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p plot.app/Contents/MacOS
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p plot.app/Contents/Resources
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/plot/" \
|
||||
@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >plot.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >plot.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f plot$(EXEEXT) plot.app/Contents/MacOS/plot
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns plot.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@plot_bundle: $(____plot_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
|
@@ -222,7 +222,7 @@ clean:
|
||||
-if exist $(OBJS)\plot.ils del $(OBJS)\plot.ils
|
||||
|
||||
$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
|
||||
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(LDFLAGS) @&&|
|
||||
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(PLOT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\plot_plot.res
|
||||
|
|
||||
|
||||
|
@@ -12,7 +12,7 @@ include ../../../build/msw/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF$@.d -MD -MP
|
||||
CPPDEPS = -MT$@ -MF$@.d -MD
|
||||
WX_RELEASE_NODOT = 28
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
@@ -217,7 +217,7 @@ clean:
|
||||
-if exist $(OBJS)\plot.exe del $(OBJS)\plot.exe
|
||||
|
||||
$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot_rc.o
|
||||
$(CXX) -o $@ $(PLOT_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
|
||||
$(CXX) -o $@ $(PLOT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
|
||||
|
||||
$(OBJS)\plot_plot.o: ./plot.cpp
|
||||
$(CXX) -c -o $@ $(PLOT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
@@ -297,7 +297,7 @@ clean:
|
||||
-if exist $(OBJS)\plot.pdb del $(OBJS)\plot.pdb
|
||||
|
||||
$(OBJS)\plot.exe: $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
|
||||
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\plot.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\plot.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
$(PLOT_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) 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
|
||||
<<
|
||||
|
||||
|
@@ -247,7 +247,7 @@ $(OBJS)\plot.exe : $(PLOT_OBJECTS) $(OBJS)\plot_plot.res
|
||||
@%append $(OBJS)\plot.lbc option quiet
|
||||
@%append $(OBJS)\plot.lbc name $^@
|
||||
@%append $(OBJS)\plot.lbc option caseexact
|
||||
@%append $(OBJS)\plot.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
|
||||
@%append $(OBJS)\plot.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(PLOT_OBJECTS)) do @%append $(OBJS)\plot.lbc file %i
|
||||
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__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) $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\plot.lbc library %i
|
||||
@%append $(OBJS)\plot.lbc option resource=$(OBJS)\plot_plot.res
|
||||
|
Reference in New Issue
Block a user