fixed issue #20: GTK preference UI was broken in both Linux and Mac OS X

This commit is contained in:
David Ludwig 2017-08-30 12:17:37 -04:00
parent 1983aa1652
commit dbd997fa47
2 changed files with 10 additions and 0 deletions

View File

@ -1227,6 +1227,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
HAVE_CONFIG_H, HAVE_CONFIG_H,
"USE_XCODE=1",
"DEBUG=1", "DEBUG=1",
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@ -1281,6 +1282,7 @@
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
HAVE_CONFIG_H, HAVE_CONFIG_H,
"USE_XCODE=1",
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

View File

@ -1,6 +1,13 @@
/* config.h. Generated from config.h.in by configure. */ /* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */ /* config.h.in. Generated from configure.ac by autoheader. */
#if ! USE_XCODE
// HACK, dludwig@pobox.com: Unless we are building with Xcode, use the
// config.h file that Autotools generates. This is located in
// BasiliskII/src/Unix/
#include "../Unix/config.h"
#else
/* Define if building universal (internal helper macro) */ /* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */ /* #undef AC_APPLE_UNIVERSAL_BUILD */
@ -811,3 +818,4 @@
#define FPU_UAE 1 #define FPU_UAE 1
//#define FPU_IMPLEMENTATION 1 //#define FPU_IMPLEMENTATION 1
#endif