Rebake for 2.6.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -36,7 +36,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.6
|
||||
WX_VERSION = $(WX_RELEASE).1
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
OGLEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -12,6 +12,7 @@ include ../../../../build/msw/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF$@.d -MD
|
||||
WX_RELEASE_NODOT = 26
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
@@ -200,22 +201,23 @@ all: $(OBJS)\ogledit.exe
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
-if exist $(OBJS)\*.d del $(OBJS)\*.d
|
||||
-if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
|
||||
|
||||
$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit_rc.o
|
||||
$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_deprecated $(__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) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
|
||||
|
||||
$(OBJS)\ogledit_ogledit.o: ./ogledit.cpp
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\ogledit_doc.o: ./doc.cpp
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\ogledit_view.o: ./view.cpp
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\ogledit_palette.o: ./palette.cpp
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\ogledit_ogledit_rc.o: ./ogledit.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
|
||||
@@ -223,3 +225,5 @@ $(OBJS)\ogledit_ogledit_rc.o: ./ogledit.rc
|
||||
.PHONY: all clean
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
-include $(OBJS)/*.d
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -38,7 +38,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.6
|
||||
WX_VERSION = $(WX_RELEASE).1
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
@@ -194,7 +194,7 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
|
||||
data:
|
||||
@mkdir -p .
|
||||
@for f in studio_resources.wxr; do \
|
||||
if test ! -f ./$$f ; \
|
||||
if test ! -f ./$$f -a ! -d ./$$f ; \
|
||||
then x=yep ; \
|
||||
else x=`find $(srcdir)/$$f -newer ./$$f -print` ; \
|
||||
fi; \
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
@@ -12,6 +12,7 @@ include ../../../../build/msw/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF$@.d -MD
|
||||
WX_RELEASE_NODOT = 26
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
@@ -214,6 +215,7 @@ all: $(OBJS)\studio.exe data
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
-if exist $(OBJS)\*.d del $(OBJS)\*.d
|
||||
-if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
|
||||
|
||||
$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio_rc.o
|
||||
@@ -224,34 +226,34 @@ data:
|
||||
for %%f in (studio_resources.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
|
||||
|
||||
$(OBJS)\studio_studio.o: ./studio.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_doc.o: ./doc.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_shapes.o: ./shapes.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_symbols.o: ./symbols.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_view.o: ./view.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_cspalette.o: ./cspalette.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_mainfrm.o: ./mainfrm.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_project.o: ./project.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_dialogs.o: ./dialogs.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_csprint.o: ./csprint.cpp
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
|
||||
$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\studio_studio_rc.o: ./studio.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include
|
||||
@@ -259,3 +261,5 @@ $(OBJS)\studio_studio_rc.o: ./studio.rc
|
||||
.PHONY: all clean data
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
-include $(OBJS)/*.d
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
@@ -1,6 +1,6 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.8 (http://bakefile.sourceforge.net)
|
||||
# Bakefile 0.1.9 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
Reference in New Issue
Block a user