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:
@@ -86,10 +86,10 @@ PSR=parsegen
|
||||
.SUFFIXES: .cpp .c .asm .psr
|
||||
|
||||
%.o: %.cpp
|
||||
@CXX@ @CFLAGS@ -o $@ -c $<
|
||||
@CXX@ @CXXFLAGS@ -o $@ -c $<
|
||||
|
||||
%: %.cpp
|
||||
@CXX@ @CFLAGS@ -o $@ $<
|
||||
@CXX@ @CXXFLAGS@ -o $@ $<
|
||||
|
||||
%.o: %.c
|
||||
@CC@ @CFLAGS@ -o $@ -c $<
|
||||
@@ -102,13 +102,13 @@ endif
|
||||
|
||||
%.o: %.psr
|
||||
./${PSR} -D__UNIXSDL__ temppsr.c $<
|
||||
@CC@ -I. -o $@ -c temppsr.c
|
||||
@CC@ -I. -O1 -o $@ -c temppsr.c
|
||||
rm -f temppsr.c
|
||||
|
||||
ALL: @ZSNESEXE@
|
||||
|
||||
@ZSNESEXE@: ${PSR} ${ZOBJS}
|
||||
@CXX@ -o @ZSNESEXE@ ${ZOBJS} @CFLAGS@ @LDFLAGS@
|
||||
@CXX@ -o @ZSNESEXE@ ${ZOBJS} @CXXFLAGS@ @LDFLAGS@
|
||||
|
||||
${PSR}: parsegen.cpp
|
||||
|
||||
@@ -118,22 +118,22 @@ ALL:
|
||||
tools: cutrtype extraext minwhite nreplace sec-test srccount
|
||||
|
||||
cutrtype: ${TOOLSOBJ}
|
||||
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/cutrtype ${TOOLSDIR}/cutrtype.cpp ${TOOLSOBJ}
|
||||
@CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/cutrtype ${TOOLSDIR}/cutrtype.cpp ${TOOLSOBJ}
|
||||
|
||||
extraext: ${TOOLSOBJ}
|
||||
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/extraext ${TOOLSDIR}/extraext.cpp ${TOOLSOBJ}
|
||||
@CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/extraext ${TOOLSDIR}/extraext.cpp ${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}
|
||||
@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}
|
||||
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/sec-test ${TOOLSDIR}/sec-test.cpp ${TOOLSOBJ}
|
||||
@CXX@ @CXXFLAGS@ -o ${TOOLSDIR}/sec-test ${TOOLSDIR}/sec-test.cpp ${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
|
||||
cfgparse.o: cfgparse.psr
|
||||
|
||||
@@ -433,11 +433,11 @@ if test x$enable_cpucheck != xno; then
|
||||
AC_MSG_RESULT(found)
|
||||
CPU_INFO=$(<conf.cpuchk)
|
||||
ifelse([$1], , :, [$1])
|
||||
rm conf.cpuchk
|
||||
else
|
||||
AC_MSG_RESULT(not found)
|
||||
ifelse([$2], , :, [$2])
|
||||
fi
|
||||
rm conf.cpuchk
|
||||
AC_SUBST(CPU_INFO)
|
||||
|
||||
else
|
||||
|
||||
@@ -124,11 +124,11 @@ else
|
||||
|
||||
if test x$release = xyes; then
|
||||
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"
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS="$CFLAGS -O2 -fomit-frame-pointer -s"
|
||||
CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -s"
|
||||
NFLAGS="$NFLAGS -O1"
|
||||
fi
|
||||
|
||||
@@ -165,6 +165,7 @@ else
|
||||
CFLAGS="$CFLAGS -march=$CPU_INFO"
|
||||
fi
|
||||
fi
|
||||
CXXFLAGS="$CFLAGS -fno-rtti"
|
||||
|
||||
dnl Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
@@ -200,5 +201,12 @@ fi
|
||||
echo
|
||||
echo The binary will be installed in $prefix/bin
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user