Small rm fix, gmake instead of make for bsd platforms, changes in -O params and better use of -no-rtti.

This commit is contained in:
grinvader
2005-10-23 20:26:43 +00:00
parent adfa6806b0
commit 7e34c3fdfc
3 changed files with 22 additions and 14 deletions

View File

@@ -86,10 +86,10 @@ PSR=parsegen
.SUFFIXES: .cpp .c .asm .psr .SUFFIXES: .cpp .c .asm .psr
%.o: %.cpp %.o: %.cpp
@CXX@ @CFLAGS@ -o $@ -c $< @CXX@ @CXXFLAGS@ -o $@ -c $<
%: %.cpp %: %.cpp
@CXX@ @CFLAGS@ -o $@ $< @CXX@ @CXXFLAGS@ -o $@ $<
%.o: %.c %.o: %.c
@CC@ @CFLAGS@ -o $@ -c $< @CC@ @CFLAGS@ -o $@ -c $<
@@ -102,13 +102,13 @@ endif
%.o: %.psr %.o: %.psr
./${PSR} -D__UNIXSDL__ temppsr.c $< ./${PSR} -D__UNIXSDL__ temppsr.c $<
@CC@ -I. -o $@ -c temppsr.c @CC@ -I. -O1 -o $@ -c temppsr.c
rm -f temppsr.c rm -f temppsr.c
ALL: @ZSNESEXE@ ALL: @ZSNESEXE@
@ZSNESEXE@: ${PSR} ${ZOBJS} @ZSNESEXE@: ${PSR} ${ZOBJS}
@CXX@ -o @ZSNESEXE@ ${ZOBJS} @CFLAGS@ @LDFLAGS@ @CXX@ -o @ZSNESEXE@ ${ZOBJS} @CXXFLAGS@ @LDFLAGS@
${PSR}: parsegen.cpp ${PSR}: parsegen.cpp
@@ -118,22 +118,22 @@ ALL:
tools: cutrtype extraext minwhite nreplace sec-test srccount tools: cutrtype extraext minwhite nreplace sec-test srccount
cutrtype: ${TOOLSOBJ} cutrtype: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/cutrtype ${TOOLSDIR}/cutrtype.cpp ${TOOLSOBJ} @CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/cutrtype ${TOOLSDIR}/cutrtype.cpp ${TOOLSOBJ}
extraext: ${TOOLSOBJ} extraext: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/extraext ${TOOLSDIR}/extraext.cpp ${TOOLSOBJ} @CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/extraext ${TOOLSDIR}/extraext.cpp ${TOOLSOBJ}
minwhite: ${TOOLSOBJ} minwhite: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/minwhite ${TOOLSDIR}/minwhite.cpp ${TOOLSDIR}/fileutil.o @CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/minwhite ${TOOLSDIR}/minwhite.cpp ${TOOLSDIR}/fileutil.o
nreplace: ${TOOLSOBJ} nreplace: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/nreplace ${TOOLSDIR}/nreplace.cpp ${TOOLSDIR}/fileutil.o @CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/nreplace ${TOOLSDIR}/nreplace.cpp ${TOOLSDIR}/fileutil.o
sec-test: ${TOOLSOBJ} sec-test: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/sec-test ${TOOLSDIR}/sec-test.cpp ${TOOLSOBJ} @CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/sec-test ${TOOLSDIR}/sec-test.cpp ${TOOLSOBJ}
srccount: ${TOOLSOBJ} srccount: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/srccount ${TOOLSDIR}/srccount.cpp ${TOOLSDIR}/fileutil.o @CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/srccount ${TOOLSDIR}/srccount.cpp ${TOOLSDIR}/fileutil.o
cfgload.o: cfgload.c gblhdr.h cfgload.o: cfgload.c gblhdr.h
cfgparse.o: cfgparse.psr cfgparse.o: cfgparse.psr

View File

@@ -433,11 +433,11 @@ if test x$enable_cpucheck != xno; then
AC_MSG_RESULT(found) AC_MSG_RESULT(found)
CPU_INFO=$(<conf.cpuchk) CPU_INFO=$(<conf.cpuchk)
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
rm conf.cpuchk
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
fi fi
rm conf.cpuchk
AC_SUBST(CPU_INFO) AC_SUBST(CPU_INFO)
else else

View File

@@ -124,11 +124,11 @@ else
if test x$release = xyes; then if test x$release = xyes; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -ffast-math -fno-exceptions -fprefetch-loop-arrays -fno-rtti -frename-registers -fforce-addr -s" CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -ffast-math -fno-exceptions -fprefetch-loop-arrays -frename-registers -fforce-addr -s"
NFLAGS="$NFLAGS -O99999999" NFLAGS="$NFLAGS -O99999999"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
CFLAGS="$CFLAGS -O2 -fomit-frame-pointer -s" CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -s"
NFLAGS="$NFLAGS -O1" NFLAGS="$NFLAGS -O1"
fi fi
@@ -165,6 +165,7 @@ else
CFLAGS="$CFLAGS -march=$CPU_INFO" CFLAGS="$CFLAGS -march=$CPU_INFO"
fi fi
fi fi
CXXFLAGS="$CFLAGS -fno-rtti"
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
@@ -200,5 +201,12 @@ fi
echo echo
echo The binary will be installed in $prefix/bin echo The binary will be installed in $prefix/bin
echo echo
echo Configure complete, now type \'make\' and pray. case "$target" in
*-*-*bsd*)
echo Configure complete, now type \'gmake\' and pray.
;;
*)
echo Configure complete, now type \'make\' and pray.
;;
esac
echo echo