Permalink
Browse files

Add to gambc-cc script the ability to report OBJ_EXTENSION, EXE_EXTEN…

…SION, and BAT_EXTENSION (in addition to the LIB_EXTENSION which was previously available).
  • Loading branch information...
feeley committed Feb 3, 2012
1 parent 958f882 commit 5a590cd2cfb1d17e66bce166906aaf519feeee44
Showing with 128 additions and 12 deletions.
  1. +24 −0 bin/gambc-cc.bat.windows.in
  2. +18 −0 bin/gambc-cc.unix.in
  3. +56 −7 configure
  4. +28 −3 configure.ac
  5. +2 −2 include/stamp.h
@@ -27,6 +27,9 @@ set GAMBCGSCLIB=@GAMBCGSCLIB_BAT@
set GAMBCGSILIB=@GAMBCGSILIB_BAT@
set LIB_PREFIX=@LIB_PREFIX_BAT@
set LIB_EXTENSION=@LIB_EXTENSION_BAT@
+set OBJ_EXTENSION=@OBJ_EXTENSION_BAT@
+set EXE_EXTENSION=@EXE_EXTENSION_BAT@
+set BAT_EXTENSION=@BAT_EXTENSION_BAT@
if "%1" == "obj" goto obj
if not "%1" == ""obj"" goto not_obj
@@ -234,6 +237,27 @@ echo.%LIB_EXTENSION%
goto end
:not_LIB_EXTENSION
+if "%1" == "OBJ_EXTENSION" goto OBJ_EXTENSION
+if not "%1" == ""OBJ_EXTENSION"" goto not_OBJ_EXTENSION
+:OBJ_EXTENSION
+echo.%OBJ_EXTENSION%
+goto end
+:not_OBJ_EXTENSION
+
+if "%1" == "EXE_EXTENSION" goto EXE_EXTENSION
+if not "%1" == ""EXE_EXTENSION"" goto not_EXE_EXTENSION
+:EXE_EXTENSION
+echo.%EXE_EXTENSION%
+goto end
+:not_EXE_EXTENSION
+
+if "%1" == "BAT_EXTENSION" goto BAT_EXTENSION
+if not "%1" == ""BAT_EXTENSION"" goto not_BAT_EXTENSION
+:BAT_EXTENSION
+echo.%BAT_EXTENSION%
+goto end
+:not_BAT_EXTENSION
+
echo.gambc-cc.bat unknown operation "%1"
exit /b 1
View
@@ -27,6 +27,9 @@ GAMBCGSCLIB=@GAMBCGSCLIB_SH@
GAMBCGSILIB=@GAMBCGSILIB_SH@
LIB_PREFIX=@LIB_PREFIX_SH@
LIB_EXTENSION=@LIB_EXTENSION_SH@
+OBJ_EXTENSION=@OBJ_EXTENSION_SH@
+EXE_EXTENSION=@EXE_EXTENSION_SH@
+BAT_EXTENSION=@BAT_EXTENSION_SH@
case "$1" in
@@ -150,6 +153,18 @@ case "$1" in
echo "${LIB_EXTENSION}"
;;
+ "OBJ_EXTENSION")
+ echo "${OBJ_EXTENSION}"
+ ;;
+
+ "EXE_EXTENSION")
+ echo "${EXE_EXTENSION}"
+ ;;
+
+ "BAT_EXTENSION")
+ echo "${BAT_EXTENSION}"
+ ;;
+
"")
# Dump configure script settings
@@ -180,6 +195,9 @@ case "$1" in
echo GAMBCGSILIB=`echo "${GAMBCGSILIB}" | ${ESC_SH}`
echo LIB_PREFIX=`echo "${LIB_PREFIX}" | ${ESC_SH}`
echo LIB_EXTENSION=`echo "${LIB_EXTENSION}" | ${ESC_SH}`
+ echo OBJ_EXTENSION=`echo "${OBJ_EXTENSION}" | ${ESC_SH}`
+ echo EXE_EXTENSION=`echo "${EXE_EXTENSION}" | ${ESC_SH}`
+ echo BAT_EXTENSION=`echo "${BAT_EXTENSION}" | ${ESC_SH}`
;;
*)
View
@@ -805,6 +805,9 @@ GAMBCGSCLIB
GAMBCGSILIB
LIB_PREFIX
LIB_EXTENSION
+OBJ_EXTENSION
+EXE_EXTENSION
+BAT_EXTENSION
BUILD_OBJ_MF
BUILD_DYN_MF
BUILD_LIB_MF
@@ -817,6 +820,9 @@ GAMBCGSCLIB_MF
GAMBCGSILIB_MF
LIB_PREFIX_MF
LIB_EXTENSION_MF
+OBJ_EXTENSION_MF
+EXE_EXTENSION_MF
+BAT_EXTENSION_MF
BUILD_OBJ_SH
BUILD_DYN_SH
BUILD_LIB_SH
@@ -829,6 +835,9 @@ GAMBCGSCLIB_SH
GAMBCGSILIB_SH
LIB_PREFIX_SH
LIB_EXTENSION_SH
+OBJ_EXTENSION_SH
+EXE_EXTENSION_SH
+BAT_EXTENSION_SH
BUILD_OBJ_BAT
BUILD_DYN_BAT
BUILD_LIB_BAT
@@ -841,6 +850,9 @@ GAMBCGSCLIB_BAT
GAMBCGSILIB_BAT
LIB_PREFIX_BAT
LIB_EXTENSION_BAT
+OBJ_EXTENSION_BAT
+EXE_EXTENSION_BAT
+BAT_EXTENSION_BAT
BUILD_OBJ_ECHO
BUILD_DYN_ECHO
BUILD_LIB_ECHO
@@ -26153,13 +26165,17 @@ fi
emacsdir="\${datadir}/emacs/site-lisp"
+OBJ_EXTENSION="$obj"
+EXE_EXTENSION="$exe"
+BAT_EXTENSION="$bat"
+
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_CPU=\"\\\"$target_cpu\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_VENDOR=\"\\\"$target_vendor\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"`echo "$0$ac_configure_args" | sed -e s/\\\\\\\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/g -e s/\\\\\\\"/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"/g`\"\\\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$bat\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$OBJ_EXTENSION\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$EXE_EXTENSION\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$BAT_EXTENSION\\\"\""
###############################################################################
@@ -26197,6 +26213,9 @@ GAMBCGSCLIB_MF=`echo "$GAMBCGSCLIB" | $ESC_MF`
GAMBCGSILIB_MF=`echo "$GAMBCGSILIB" | $ESC_MF`
LIB_PREFIX_MF=`echo "$LIB_PREFIX" | $ESC_MF`
LIB_EXTENSION_MF=`echo "$LIB_EXTENSION" | $ESC_MF`
+OBJ_EXTENSION_MF=`echo "$OBJ_EXTENSION" | $ESC_MF`
+EXE_EXTENSION_MF=`echo "$EXE_EXTENSION" | $ESC_MF`
+BAT_EXTENSION_MF=`echo "$BAT_EXTENSION" | $ESC_MF`
C_COMPILER_SH=`echo "$C_COMPILER" | $ESC_SH`
C_PREPROC_SH=`echo "$C_PREPROC" | $ESC_SH`
@@ -26224,6 +26243,9 @@ GAMBCGSCLIB_SH=`echo "$GAMBCGSCLIB" | $ESC_SH`
GAMBCGSILIB_SH=`echo "$GAMBCGSILIB" | $ESC_SH`
LIB_PREFIX_SH=`echo "$LIB_PREFIX" | $ESC_SH`
LIB_EXTENSION_SH=`echo "$LIB_EXTENSION" | $ESC_SH`
+OBJ_EXTENSION_SH=`echo "$OBJ_EXTENSION" | $ESC_SH`
+EXE_EXTENSION_SH=`echo "$EXE_EXTENSION" | $ESC_SH`
+BAT_EXTENSION_SH=`echo "$BAT_EXTENSION" | $ESC_SH`
C_COMPILER_BAT=`echo "$C_COMPILER" | $ESC_BAT`
C_PREPROC_BAT=`echo "$C_PREPROC" | $ESC_BAT`
@@ -26251,6 +26273,9 @@ GAMBCGSCLIB_BAT=`echo "$GAMBCGSCLIB" | $ESC_BAT`
GAMBCGSILIB_BAT=`echo "$GAMBCGSILIB" | $ESC_BAT`
LIB_PREFIX_BAT=`echo "$LIB_PREFIX" | $ESC_BAT`
LIB_EXTENSION_BAT=`echo "$LIB_EXTENSION" | $ESC_BAT`
+OBJ_EXTENSION_BAT=`echo "$OBJ_EXTENSION" | $ESC_BAT`
+EXE_EXTENSION_BAT=`echo "$EXE_EXTENSION" | $ESC_BAT`
+BAT_EXTENSION_BAT=`echo "$BAT_EXTENSION" | $ESC_BAT`
BUILD_OBJ_ECHO=`echo "$BUILD_OBJ" | $ESC_ECHO`
BUILD_DYN_ECHO=`echo "$BUILD_DYN" | $ESC_ECHO`
@@ -26353,6 +26378,18 @@ INSTALL_PROGRAM='$(rootfromhere)/install-sh -c -m 755'
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27282,13 +27319,13 @@ GAMBCGSCLIB!$GAMBCGSCLIB$ac_delim
GAMBCGSILIB!$GAMBCGSILIB$ac_delim
LIB_PREFIX!$LIB_PREFIX$ac_delim
LIB_EXTENSION!$LIB_EXTENSION$ac_delim
+OBJ_EXTENSION!$OBJ_EXTENSION$ac_delim
+EXE_EXTENSION!$EXE_EXTENSION$ac_delim
+BAT_EXTENSION!$BAT_EXTENSION$ac_delim
BUILD_OBJ_MF!$BUILD_OBJ_MF$ac_delim
BUILD_DYN_MF!$BUILD_DYN_MF$ac_delim
BUILD_LIB_MF!$BUILD_LIB_MF$ac_delim
BUILD_EXE_MF!$BUILD_EXE_MF$ac_delim
-DEFS_MF!$DEFS_MF$ac_delim
-LIBS_MF!$LIBS_MF$ac_delim
-GAMBCLIB_DEFS_MF!$GAMBCLIB_DEFS_MF$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -27330,11 +27367,17 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+DEFS_MF!$DEFS_MF$ac_delim
+LIBS_MF!$LIBS_MF$ac_delim
+GAMBCLIB_DEFS_MF!$GAMBCLIB_DEFS_MF$ac_delim
GAMBCLIB_MF!$GAMBCLIB_MF$ac_delim
GAMBCGSCLIB_MF!$GAMBCGSCLIB_MF$ac_delim
GAMBCGSILIB_MF!$GAMBCGSILIB_MF$ac_delim
LIB_PREFIX_MF!$LIB_PREFIX_MF$ac_delim
LIB_EXTENSION_MF!$LIB_EXTENSION_MF$ac_delim
+OBJ_EXTENSION_MF!$OBJ_EXTENSION_MF$ac_delim
+EXE_EXTENSION_MF!$EXE_EXTENSION_MF$ac_delim
+BAT_EXTENSION_MF!$BAT_EXTENSION_MF$ac_delim
BUILD_OBJ_SH!$BUILD_OBJ_SH$ac_delim
BUILD_DYN_SH!$BUILD_DYN_SH$ac_delim
BUILD_LIB_SH!$BUILD_LIB_SH$ac_delim
@@ -27347,6 +27390,9 @@ GAMBCGSCLIB_SH!$GAMBCGSCLIB_SH$ac_delim
GAMBCGSILIB_SH!$GAMBCGSILIB_SH$ac_delim
LIB_PREFIX_SH!$LIB_PREFIX_SH$ac_delim
LIB_EXTENSION_SH!$LIB_EXTENSION_SH$ac_delim
+OBJ_EXTENSION_SH!$OBJ_EXTENSION_SH$ac_delim
+EXE_EXTENSION_SH!$EXE_EXTENSION_SH$ac_delim
+BAT_EXTENSION_SH!$BAT_EXTENSION_SH$ac_delim
BUILD_OBJ_BAT!$BUILD_OBJ_BAT$ac_delim
BUILD_DYN_BAT!$BUILD_DYN_BAT$ac_delim
BUILD_LIB_BAT!$BUILD_LIB_BAT$ac_delim
@@ -27359,6 +27405,9 @@ GAMBCGSCLIB_BAT!$GAMBCGSCLIB_BAT$ac_delim
GAMBCGSILIB_BAT!$GAMBCGSILIB_BAT$ac_delim
LIB_PREFIX_BAT!$LIB_PREFIX_BAT$ac_delim
LIB_EXTENSION_BAT!$LIB_EXTENSION_BAT$ac_delim
+OBJ_EXTENSION_BAT!$OBJ_EXTENSION_BAT$ac_delim
+EXE_EXTENSION_BAT!$EXE_EXTENSION_BAT$ac_delim
+BAT_EXTENSION_BAT!$BAT_EXTENSION_BAT$ac_delim
BUILD_OBJ_ECHO!$BUILD_OBJ_ECHO$ac_delim
BUILD_DYN_ECHO!$BUILD_DYN_ECHO$ac_delim
BUILD_LIB_ECHO!$BUILD_LIB_ECHO$ac_delim
@@ -27397,7 +27446,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
View
@@ -1853,13 +1853,17 @@ fi
emacsdir="\${datadir}/emacs/site-lisp"
+OBJ_EXTENSION="$obj"
+EXE_EXTENSION="$exe"
+BAT_EXTENSION="$bat"
+
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_CPU=\"\\\"$target_cpu\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_VENDOR=\"\\\"$target_vendor\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___SYS_TYPE_OS=\"\\\"$target_os\\\"\""
GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___CONFIGURE_COMMAND=\"\\\"`echo "$0$ac_configure_args" | sed -e s/\\\\\\\\/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\/g -e s/\\\\\\\"/\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\"/g`\"\\\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$obj\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$exe\\\"\""
-GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$bat\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___OBJ_EXTENSION=\"\\\"$OBJ_EXTENSION\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___EXE_EXTENSION=\"\\\"$EXE_EXTENSION\\\"\""
+GAMBCLIB_DEFS="$GAMBCLIB_DEFS -D___BAT_EXTENSION=\"\\\"$BAT_EXTENSION\\\"\""
###############################################################################
@@ -1897,6 +1901,9 @@ GAMBCGSCLIB_MF=`echo "$GAMBCGSCLIB" | $ESC_MF`
GAMBCGSILIB_MF=`echo "$GAMBCGSILIB" | $ESC_MF`
LIB_PREFIX_MF=`echo "$LIB_PREFIX" | $ESC_MF`
LIB_EXTENSION_MF=`echo "$LIB_EXTENSION" | $ESC_MF`
+OBJ_EXTENSION_MF=`echo "$OBJ_EXTENSION" | $ESC_MF`
+EXE_EXTENSION_MF=`echo "$EXE_EXTENSION" | $ESC_MF`
+BAT_EXTENSION_MF=`echo "$BAT_EXTENSION" | $ESC_MF`
C_COMPILER_SH=`echo "$C_COMPILER" | $ESC_SH`
C_PREPROC_SH=`echo "$C_PREPROC" | $ESC_SH`
@@ -1924,6 +1931,9 @@ GAMBCGSCLIB_SH=`echo "$GAMBCGSCLIB" | $ESC_SH`
GAMBCGSILIB_SH=`echo "$GAMBCGSILIB" | $ESC_SH`
LIB_PREFIX_SH=`echo "$LIB_PREFIX" | $ESC_SH`
LIB_EXTENSION_SH=`echo "$LIB_EXTENSION" | $ESC_SH`
+OBJ_EXTENSION_SH=`echo "$OBJ_EXTENSION" | $ESC_SH`
+EXE_EXTENSION_SH=`echo "$EXE_EXTENSION" | $ESC_SH`
+BAT_EXTENSION_SH=`echo "$BAT_EXTENSION" | $ESC_SH`
C_COMPILER_BAT=`echo "$C_COMPILER" | $ESC_BAT`
C_PREPROC_BAT=`echo "$C_PREPROC" | $ESC_BAT`
@@ -1951,6 +1961,9 @@ GAMBCGSCLIB_BAT=`echo "$GAMBCGSCLIB" | $ESC_BAT`
GAMBCGSILIB_BAT=`echo "$GAMBCGSILIB" | $ESC_BAT`
LIB_PREFIX_BAT=`echo "$LIB_PREFIX" | $ESC_BAT`
LIB_EXTENSION_BAT=`echo "$LIB_EXTENSION" | $ESC_BAT`
+OBJ_EXTENSION_BAT=`echo "$OBJ_EXTENSION" | $ESC_BAT`
+EXE_EXTENSION_BAT=`echo "$EXE_EXTENSION" | $ESC_BAT`
+BAT_EXTENSION_BAT=`echo "$BAT_EXTENSION" | $ESC_BAT`
BUILD_OBJ_ECHO=`echo "$BUILD_OBJ" | $ESC_ECHO`
BUILD_DYN_ECHO=`echo "$BUILD_DYN" | $ESC_ECHO`
@@ -1993,6 +2006,9 @@ AC_SUBST(GAMBCGSCLIB)
AC_SUBST(GAMBCGSILIB)
AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_EXTENSION)
+AC_SUBST(OBJ_EXTENSION)
+AC_SUBST(EXE_EXTENSION)
+AC_SUBST(BAT_EXTENSION)
AC_SUBST(BUILD_OBJ_MF)
AC_SUBST(BUILD_DYN_MF)
@@ -2006,6 +2022,9 @@ AC_SUBST(GAMBCGSCLIB_MF)
AC_SUBST(GAMBCGSILIB_MF)
AC_SUBST(LIB_PREFIX_MF)
AC_SUBST(LIB_EXTENSION_MF)
+AC_SUBST(OBJ_EXTENSION_MF)
+AC_SUBST(EXE_EXTENSION_MF)
+AC_SUBST(BAT_EXTENSION_MF)
AC_SUBST(BUILD_OBJ_SH)
AC_SUBST(BUILD_DYN_SH)
@@ -2019,6 +2038,9 @@ AC_SUBST(GAMBCGSCLIB_SH)
AC_SUBST(GAMBCGSILIB_SH)
AC_SUBST(LIB_PREFIX_SH)
AC_SUBST(LIB_EXTENSION_SH)
+AC_SUBST(OBJ_EXTENSION_SH)
+AC_SUBST(EXE_EXTENSION_SH)
+AC_SUBST(BAT_EXTENSION_SH)
AC_SUBST(BUILD_OBJ_BAT)
AC_SUBST(BUILD_DYN_BAT)
@@ -2032,6 +2054,9 @@ AC_SUBST(GAMBCGSCLIB_BAT)
AC_SUBST(GAMBCGSILIB_BAT)
AC_SUBST(LIB_PREFIX_BAT)
AC_SUBST(LIB_EXTENSION_BAT)
+AC_SUBST(OBJ_EXTENSION_BAT)
+AC_SUBST(EXE_EXTENSION_BAT)
+AC_SUBST(BAT_EXTENSION_BAT)
AC_SUBST(BUILD_OBJ_ECHO)
AC_SUBST(BUILD_DYN_ECHO)
View
@@ -2,5 +2,5 @@
* Time stamp of last source code repository commit.
*/
-#define ___STAMP_YMD 20120201
-#define ___STAMP_HMS 144730
+#define ___STAMP_YMD 20120203
+#define ___STAMP_HMS 154908

0 comments on commit 5a590cd

Please sign in to comment.