diff --git a/config.h.in b/config.h.in index 8e1250cf4..9124ec309 100644 --- a/config.h.in +++ b/config.h.in @@ -54,9 +54,6 @@ /* Define to 1 to enable floating point emulation */ #undef C_FPU -/* Define to 1 to use a x86 assembly fpu core */ -#undef C_FPU_X86 - /* Determines if the compilers supports attributes for structures. */ #undef C_HAS_ATTRIBUTE diff --git a/configure b/configure index 1a18407b0..705f90b75 100755 --- a/configure +++ b/configure @@ -748,7 +748,6 @@ enable_debug enable_core_inline enable_dynamic_core enable_fpu -enable_fpu_x86 enable_unaligned_memory with_dx_headers with_dx_libs @@ -1398,7 +1397,6 @@ Optional Features: --enable-core-inline Enable inlined memory handling in CPU Core --disable-dynamic-core Disable all dynamic cores --disable-fpu Disable fpu support - --disable-fpu-x86 Disable x86 assembly fpu core --disable-unaligned-memory Disable unaligned memory access --disable-shaders Disable d3d pixelshader support (which requires @@ -6820,36 +6818,6 @@ $as_echo "no" >&6; } fi -# Check whether --enable-fpu-x86 was given. -if test "${enable_fpu_x86+set}" = set; then : - enableval=$enable_fpu_x86; -else - enable_fpu_x86=yes -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether x86 assembly fpu core will be enabled" >&5 -$as_echo_n "checking whether x86 assembly fpu core will be enabled... " >&6; } -if test x$enable_fpu_x86 = xno ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -else - if test x$enable_fpu = xyes; then - if test x$c_targetcpu = xx86 ; then - $as_echo "#define C_FPU_X86 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi -fi - - # Check whether --enable-unaligned_memory was given. if test "${enable_unaligned_memory+set}" = set; then : enableval=$enable_unaligned_memory; diff --git a/src/gui/sdl_gui.cpp b/src/gui/sdl_gui.cpp index 094eef340..80e70ea6d 100644 --- a/src/gui/sdl_gui.cpp +++ b/src/gui/sdl_gui.cpp @@ -733,7 +733,7 @@ public: Section_prop *section = static_cast(sec); new SectionEditor(getScreen(), 50, 30, section); } else if (arg == "About") { - new GUI::MessageBox2(getScreen(), 200, 150, 280, "About DOSBox", "\nDOSBox SVN-Daum\nAn emulator for old DOS Games\n\nCopyright 2002-2013\nThe DOSBox Team"); + new GUI::MessageBox2(getScreen(), 200, 150, 280, "About DOSBox", "\nDOSBox-X\nAn emulator for old DOS Games\n\nCopyright 2002-2013\nThe DOSBox Team"); } else if (arg == "Introduction") { new GUI::MessageBox2(getScreen(), 20, 50, 600, "Introduction", MSG_Get("PROGRAM_INTRO")); } else if (arg == "Getting Started") { diff --git a/src/ints/int10_vesa.cpp b/src/ints/int10_vesa.cpp index 3b5802171..50c9d71c4 100644 --- a/src/ints/int10_vesa.cpp +++ b/src/ints/int10_vesa.cpp @@ -45,7 +45,7 @@ static struct { static char string_oem[]="S3 Incorporated. Trio64"; static char string_vendorname[]="DOSBox Development Team"; static char string_productname[]="DOSBox - The DOS Emulator"; -static char string_productrev[]="DOSBox SVN-Daum"; +static char string_productrev[]="DOSBox SVN-X"; #ifdef _MSC_VER #pragma pack (1)