a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed C++ compiler detection in the 'configure' script.

Browse Source
This commit is contained in:
stainless
2001-09-04 00:48:14 +00:00
parent 09bf8429df
commit 4830aa3afc
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zsnes/src/Makefile.in
View File

@@ -65,7 +65,7 @@ OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${ZIPOBJ}
@CC@ @CFLAGS@ -o $@ -c $< @CC@ @CFLAGS@ -o $@ -c $<
%.o: %.cpp %.o: %.cpp
@CXX@ @CFLAGS@ -o $@ -c $< @CXX@ @CXXFLAGS@ -o $@ -c $<
%.o: %.asm %.o: %.asm
@NASMPATH@ @NFLAGS@ -o $@ $< @NASMPATH@ @NFLAGS@ -o $@ $<

3
zsnes/src/configure vendored
View File

@@ -537,7 +537,7 @@ fi
echo -- Where is our compiler, and who are we compiling for? echo -- Where is our compiler, and who are we compiling for?
CFLAGS="-pipe -I. -Wall" CFLAGS="-pipe -I. -Wall"
CXXFLAGS=CFLAGS CXXFLAGS=$CFLAGS
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -2323,6 +2323,7 @@ done
CXXFLAGS=$CFLAGS
trap '' 1 2 15 trap '' 1 2 15
cat > confcache <<\EOF cat > confcache <<\EOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure

2
zsnes/src/configure.in
View File

@@ -16,6 +16,7 @@ dnl See also: remarks supplied in the debug checking area below
AC_INIT(init.asm) AC_INIT(init.asm)
echo -- Where is our compiler, and who are we compiling for? echo -- Where is our compiler, and who are we compiling for?
CFLAGS="-pipe -I. -Wall" CFLAGS="-pipe -I. -Wall"
CXXFLAGS=$CFLAGS
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PATH_PROG(NASMPATH,nasm,[AC_MSG_ERROR(nasm 0.98 is required)]) AC_PATH_PROG(NASMPATH,nasm,[AC_MSG_ERROR(nasm 0.98 is required)])
@@ -179,6 +180,7 @@ dnl Checks for library functions.
AC_SUBST(ZSNESEXE) AC_SUBST(ZSNESEXE)
AC_SUBST(GL_DRAW) AC_SUBST(GL_DRAW)
AC_SUBST(NFLAGS) AC_SUBST(NFLAGS)
CXXFLAGS=$CFLAGS
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)
echo echo
echo You may now run make to compile $ZSNESEXE echo You may now run make to compile $ZSNESEXE