--- previous/configure 2018/04/24 19:25:10 1.1 +++ previous/configure 2018/04/24 19:33:02 1.1.1.3 @@ -4,7 +4,7 @@ # for those used to the autotools configure script conventions if ! which cmake > /dev/null; then - echo "ERROR: You need the 'cmake' program to configure the Hatari build process." + echo "ERROR: You need the 'cmake' program to configure the Previous build process." echo "Please install 'cmake' first, then try again." exit 1 fi @@ -15,8 +15,6 @@ print_help() echo "Parameters are:" echo " --prefix= Set the install prefix to path" echo " --enable-debug Enable debug (non-optimized) build" - echo " --enable-small-mem Use less memory - at the expense of emulation speed" - echo " --disable-dsp Disable DSP emulation for Falcon mode." echo " --disable-tracing Disable tracing messages for debugging" echo " --disable-osx-bundle Disable application bundling on Mac OS X" echo " --cross-compile-win32 Build the Windows version under linux" @@ -49,24 +47,12 @@ do build_type="Release" cmake_args="$cmake_args -DCMAKE_BUILD_TYPE:STRING=Release" ;; - --enable-dsp) - cmake_args="$cmake_args -DENABLE_DSP_EMU:BOOL=1" - ;; - --disable-dsp) - cmake_args="$cmake_args -DENABLE_DSP_EMU:BOOL=0" - ;; --enable-tracing) cmake_args="$cmake_args -DENABLE_TRACING:BOOL=1" ;; --disable-tracing) cmake_args="$cmake_args -DENABLE_TRACING:BOOL=0" ;; - --enable-small-mem) - cmake_args="$cmake_args -DENABLE_SMALL_MEM:BOOL=1" - ;; - --disable-small-mem) - cmake_args="$cmake_args -DENABLE_SMALL_MEM:BOOL=0" - ;; --enable-osx-bundle) cmake_args="$cmake_args -DENABLE_OSX_BUNDLE:BOOL=1" ;; @@ -85,6 +71,9 @@ do shift 1 done +# remove previous cmake's cache +rm -f `dirname $0`/CMakeCache.txt + cmake `dirname $0` $cmake_args || exit 1 echo