Regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31967 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!
|
||||
# =========================================================================
|
||||
|
||||
@@ -15,12 +15,14 @@ include ../../../build/msw/config.gcc
|
||||
WX_RELEASE_NODOT = 25
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
TEX2RTF_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
|
||||
-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
||||
-I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) -DNO_GUI \
|
||||
$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
-I.\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
|
||||
-DNO_GUI $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) -Wno-ctor-dtor-privacy \
|
||||
$(CPPFLAGS) $(CXXFLAGS)
|
||||
TEX2RTF_OBJECTS = \
|
||||
$(OBJS)\tex2rtf_tex2rtf.o \
|
||||
$(OBJS)\tex2rtf_tex2any.o \
|
||||
@@ -32,9 +34,9 @@ TEX2RTF_OBJECTS = \
|
||||
$(OBJS)\tex2rtf_table.o
|
||||
TEX2RTF_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
|
||||
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. \
|
||||
$(__DLLFLAG_p) -I.\..\..\..\samples -DNOPCH $(__EXCEPTIONSFLAG) \
|
||||
$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
|
||||
$(__EXCEPTIONSFLAG_0) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
|
||||
TEX2RTF_GUI_OBJECTS = \
|
||||
$(OBJS)\tex2rtf_gui_sample_rc.o \
|
||||
$(OBJS)\tex2rtf_gui_tex2rtf.o \
|
||||
@@ -74,6 +76,12 @@ endif
|
||||
ifeq ($(SHARED),1)
|
||||
WXDLLFLAG = dll
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
LIBTYPE_SUFFIX = lib
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
LIBTYPE_SUFFIX = dll
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
EXTRALIBS_FOR_BASE =
|
||||
endif
|
||||
@@ -140,12 +148,6 @@ endif
|
||||
ifeq ($(UNICODE),1)
|
||||
__UNICODE_DEFINE_p = -D_UNICODE
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
LIBDIRNAME = .\..\..\..\lib\gcc_lib$(CFG)
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
LIBDIRNAME = .\..\..\..\lib\gcc_dll$(CFG)
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
__DLLFLAG_p = -DWXUSINGDLL
|
||||
endif
|
||||
@@ -233,7 +235,7 @@ $(OBJS)\tex2rtf_table.o: ./table.cpp
|
||||
$(CXX) -c -o $@ $(TEX2RTF_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\tex2rtf_gui_sample_rc.o: ./../../../samples/sample.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../../samples
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../../samples
|
||||
|
||||
$(OBJS)\tex2rtf_gui_tex2rtf.o: ./tex2rtf.cpp
|
||||
$(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
|
||||
@@ -260,3 +262,4 @@ $(OBJS)\tex2rtf_gui_table.o: ./table.cpp
|
||||
$(CXX) -c -o $@ $(TEX2RTF_GUI_CXXFLAGS) $<
|
||||
|
||||
.PHONY: all clean
|
||||
|
||||
|
Reference in New Issue
Block a user