Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed CPPFLAGS to CXXFLAGS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-08-09 00:26:53 +00:00
parent 06dda230f6
commit ea8628fb74
2 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/makeprog.env.in
View File

@@ -3,53 +3,53 @@
# Clears all default suffixes
.SUFFIXES: .o .cpp .c .cxx
# The binary program extension, if any, including dots (e.g. '.exe')
# The binary program extension, if any, including dots {e.g. '.exe'}
PROGRAM_EXT = @PROGRAM_EXT@
BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
RES_PROGRAM = $(PROGRAM)_resources.o
BIN_PROGRAM = ${PROGRAM}${PROGRAM_EXT}
RES_PROGRAM = ${PROGRAM}_resources.o
RES_PROGRAM_OPT = @RESPROGRAM@
# To add resources to the Mac OS X applications
LIBWX_MACRES = $(top_builddir)/lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r
LIBWX_MACRESCOMP = $(RESCOMP) $(RESFLAGS) $(LIBWX_MACRES) -o $(BIN_PROGRAM)
LIBWX_MACRES = ${top_builddir}/lib/lib@WX_LIBRARY@-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.r
LIBWX_MACRESCOMP = ${RESCOMP} ${RESFLAGS} ${LIBWX_MACRES} -o ${BIN_PROGRAM}
.c.o :
$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(APPEXTRADEFS) -o $@ $<
${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${APPEXTRADEFS} -o $@ $<
.cpp.o :
$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
.cxx.o :
$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(APPEXTRADEFS) -o $@ $<
${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $<
# the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf
VPATH = @PATH_IFS@${top_srcdir}/${program_dir} # ':' for autoconf
# Set defaults from configure
include $(top_builddir)/src/make.env
include ${top_builddir}/src/make.env
all: $(BIN_PROGRAM) install_dirs install_data
all: ${BIN_PROGRAM} install_dirs install_data
$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OPT) @LIBWXMACRES@
$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OPT)
${BIN_PROGRAM}: ${OBJECTS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${RES_PROGRAM_OPT} @LIBWXMACRES@
${CC} ${LDFLAGS} -o ${BIN_PROGRAM} ${OBJECTS} ${LDLIBS} ${LIBRARIES} ${RES_PROGRAM_OPT}
@LIBWXMACRESCOMP@
$(RES_PROGRAM): $(PROGRAM).rc
$(RESCOMP) $(RCINPUTSWITCH) $(top_srcdir)/$(program_dir)/$(PROGRAM).rc $(RCOUTPUTSWITCH) $(PROGRAM)_resources.o $(RESFLAGS)
${RES_PROGRAM}: ${PROGRAM}.rc
${RESCOMP} ${RCINPUTSWITCH} ${top_srcdir}/${program_dir}/${PROGRAM}.rc ${RCOUTPUTSWITCH} ${PROGRAM}_resources.o ${RESFLAGS}
install_dirs:
@list='$(DATADIRS)'; for p in $$list; do \
mkdir -p $(top_builddir)/$(program_dir)/$$p; \
@list='${DATADIRS}'; for p in $$list; do \
mkdir -p ${top_builddir}/${program_dir}/$$p; \
done
install_data:
@list='$(DATAFILES)'; for p in $$list; do \
if test ! -s $(top_builddir)/$(program_dir)/$$p; then \
cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \
@list='${DATAFILES}'; for p in $$list; do \
if test ! -s ${top_builddir}/${program_dir}/$$p; then \
cp -pRf ${top_srcdir}/${program_dir}/$$p ${top_builddir}/${program_dir}/$$p; \
fi; \
done
clean:
rm -f $(OBJECTS) $(BIN_PROGRAM) $(RES_PROGRAM) core
rm -f ${OBJECTS} ${BIN_PROGRAM} ${RES_PROGRAM} core