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@
|
||||
@@ -41,7 +42,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
|
||||
CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
@@ -68,6 +69,7 @@ CUBE_OBJECTS = \
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_USE_OPENGL_1@__cube___depname = cube$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_0@__cube___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__cube___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C cube$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__cube___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@@ -95,9 +97,13 @@ COND_PLATFORM_OS2_1___cube___os2_emxbindcmd = $(NM) cube$(EXEEXT) | if grep -q \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_PLATFORM_OS2_1@__cube_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__cube_bundle___depname = cube_bundle
|
||||
@COND_TOOLKIT_COCOA@____cube_BUNDLE_TGT_REF_DEP = cube.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____cube_BUNDLE_TGT_REF_DEP = cube.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_app_Contents_PkgInfo___depname \
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ = cube.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@__cube_bundle___depname = cube_bundle
|
||||
@COND_TOOLKIT_COCOA@____cube_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_COCOA@ $(__cube_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_MAC@____cube_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_MAC@ $(__cube_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)
|
||||
@@ -159,27 +165,27 @@ distclean: clean
|
||||
@COND_USE_OPENGL_1@ $(__cube___os2_emxbindcmd)
|
||||
@COND_USE_OPENGL_1@ $(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p cube.app/Contents
|
||||
mkdir -p cube.app/Contents/MacOS
|
||||
mkdir -p cube.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/cube/" \
|
||||
-e "s/VERSION/$(WX_VERSION)/" \
|
||||
$(top_srcdir)/src/mac/carbon/Info.plist.in >cube.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >cube.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
|
||||
|
||||
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube.app/Contents/PkgInfo: $(__cube___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p cube.app/Contents
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p cube.app/Contents/MacOS
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ mkdir -p cube.app/Contents/Resources
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/EXECUTABLE/cube/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ -e "s/VERSION/$(WX_VERSION)/" \
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ $(top_srcdir)/src/mac/carbon/Info.plist.in >cube.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ echo -n "APPL????" >cube.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ ln -f cube$(EXEEXT) cube.app/Contents/MacOS/cube
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@ cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns cube.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)
|
||||
@COND_PLATFORM_MACOSX_1_USE_OPENGL_1@cube_bundle: $(____cube_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
cube_cube.o: $(srcdir)/cube.cpp
|
||||
$(CXXC) -c -o $@ $(CUBE_CXXFLAGS) $(srcdir)/cube.cpp
|
||||
|
@@ -226,7 +226,7 @@ clean:
|
||||
|
||||
!if "$(USE_OPENGL)" == "1"
|
||||
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.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 $(CUBE_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.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)\cube_cube.res
|
||||
|
|
||||
!endif
|
||||
|
@@ -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)
|
||||
@@ -221,7 +221,7 @@ clean:
|
||||
|
||||
ifeq ($(USE_OPENGL),1)
|
||||
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube_rc.o
|
||||
$(CXX) -o $@ $(CUBE_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(LDFLAGS) -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__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 $@ $(CUBE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl -lopengl32 -lglu32 $(__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
|
||||
endif
|
||||
|
||||
$(OBJS)\cube_cube.o: ./cube.cpp
|
||||
|
@@ -36,7 +36,7 @@ WX_CXXFLAGS := `$(WX_CONFIG) --cxxflags`
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
|
||||
CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
|
||||
CUBE_CXXFLAGS = -I. $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
CUBE_OBJECTS = \
|
||||
cube_cube.o
|
||||
@@ -59,7 +59,7 @@ clean:
|
||||
rm -f cube
|
||||
|
||||
cube: $(CUBE_OBJECTS)
|
||||
$(CXX) -o $@ $(CUBE_OBJECTS) `$(WX_CONFIG) --libs gl,core,base` $(LDFLAGS)
|
||||
$(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) --libs gl,core,base`
|
||||
|
||||
cube_cube.o: ./cube.cpp
|
||||
$(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
@@ -301,7 +301,7 @@ clean:
|
||||
|
||||
!if "$(USE_OPENGL)" == "1"
|
||||
$(OBJS)\cube.exe: $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
|
||||
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(LDFLAGS) @<<
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /pdb:"$(OBJS)\cube.pdb" $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
$(CUBE_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.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
|
||||
<<
|
||||
!endif
|
||||
|
@@ -252,7 +252,7 @@ $(OBJS)\cube.exe : $(CUBE_OBJECTS) $(OBJS)\cube_cube.res
|
||||
@%append $(OBJS)\cube.lbc option quiet
|
||||
@%append $(OBJS)\cube.lbc name $^@
|
||||
@%append $(OBJS)\cube.lbc option caseexact
|
||||
@%append $(OBJS)\cube.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)
|
||||
@%append $(OBJS)\cube.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(CUBE_OBJECTS)) do @%append $(OBJS)\cube.lbc file %i
|
||||
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib opengl32.lib glu32.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)\cube.lbc library %i
|
||||
@%append $(OBJS)\cube.lbc option resource=$(OBJS)\cube_cube.res
|
||||
|
Reference in New Issue
Block a user