Index: configure.ac ================================================================== --- configure.ac +++ configure.ac @@ -89,12 +89,10 @@ ;; *-*-mingw*) LDFLAGS="$LDFLAGS -Wl,--allow-multiple-definition" LIBS="$LIBS -lversion" - AC_SUBST(ALLOW_MULTIPLE_DEFINITION, - [-Wl,--allow-multiple-definition]) AC_SUBST(USE_SRCS_WINDOWS, '${SRCS_WINDOWS}') ;; *-psp-*) AS_IF([test x"$DEVKITPSP" = x""], [ AC_MSG_ERROR( @@ -143,10 +141,13 @@ LIBS="$LIBS -L$DEVKITPRO/libogc/lib/wii -lfat -logc" TESTS_LIBS="$TESTS_LIBS -lwiiuse -lbte" enable_shared="no" enable_threads="no" # TODO + AC_DEFINE(OF_WII, 1, [Whether we are compiling for Wii]) + AC_SUBST(DEFINES, "-DGEKKO") + AC_SUBST(INCLUDES, '-I$DEVKITPRO/libogc/include') AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(nds, AS_HELP_STRING([--with-nds], [build for Nintendo DS])) @@ -164,12 +165,13 @@ enable_shared="no" enable_threads="no" # TODO enable_sockets="no" # TODO check_pedantic="no" - AC_DEFINE(OF_NINTENDO_DS, 1, - [Whether we are compiling for the Nintendo DS]) + AC_DEFINE(OF_NINTENDO_DS, 1, [Whether we are compiling for Nintendo DS]) + AC_SUBST(DEFINES, "-DARM9") + AC_SUBST(INCLUDES, '-I$DEVKITPRO/libnds/include') AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) AC_ARG_WITH(3ds, AS_HELP_STRING([--with-3ds], [build for Nintendo 3DS])) @@ -188,11 +190,13 @@ enable_shared="no" enable_threads="no" # TODO check_pedantic="no" AC_DEFINE(OF_NINTENDO_3DS, 1, - [Whether we are compiling for the Nintendo 3DS]) + [Whether we are compiling for Nintendo 3DS]) + AC_SUBST(DEFINES, "-DARM11") + AC_SUBST(INCLUDES, '-I$DEVKITPRO/libctru/include') AC_SUBST(MAP_LDFLAGS, ['-Wl,-Map,$@.map']) ]) CPP="$OBJCPP" CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS -DOF_COMPILING_OBJFW" @@ -591,12 +595,10 @@ AC_SUBST(LDFLAGS_REEXPORT, ["-Wl,-reexport-lobjfw"]) AS_IF([test x"$objc_runtime" = x"Apple runtime"], [ AC_SUBST(REEXPORT_RUNTIME, ["-Wl,-reexport-lobjc"]) AC_SUBST(REEXPORT_RUNTIME_FRAMEWORK, ["-Wl,-reexport-lobjc"]) - AC_SUBST(WEAK_NSFOUNDATIONVERSIONNUMBER, - ["-Wl,-U,_NSFoundationVersionNumber"]) LDFLAGS="$LDFLAGS -Wl,-U,_NSFoundationVersionNumber" ]) AS_IF([test x"$objc_runtime" = x"ObjFW runtime"], [ AS_IF([test x"$exception_type" = x"DWARF"], [ @@ -1770,11 +1772,10 @@ dnl wiiload and thus likely already set by the user to something dnl that is not the path of the wiiload binary. AC_CHECK_PROG(wiiload, wiiload, wiiload) AS_IF([test x"$wiiload" != x""], [ - AC_SUBST(RUN_TESTS, "run") AC_SUBST(WRAPPER, "$wiiload") ]) ]) ], [ AC_SUBST(RUN_TESTS, "run") Index: extra.mk.in ================================================================== --- extra.mk.in +++ extra.mk.in @@ -82,7 +82,6 @@ USE_SRCS_FILES = @USE_SRCS_FILES@ USE_SRCS_PLUGINS = @USE_SRCS_PLUGINS@ USE_SRCS_SOCKETS = @USE_SRCS_SOCKETS@ USE_SRCS_THREADS = @USE_SRCS_THREADS@ USE_SRCS_WINDOWS = @USE_SRCS_WINDOWS@ -WEAK_NSFOUNDATIONVERSIONNUMBER = @WEAK_NSFOUNDATIONVERSIONNUMBER@ WRAPPER = @WRAPPER@ Index: src/objfw-defs.h.in ================================================================== --- src/objfw-defs.h.in +++ src/objfw-defs.h.in @@ -38,12 +38,14 @@ #undef OF_HAVE_SYS_TYPES_H #undef OF_HAVE_THREADS #undef OF_HAVE_UNICODE_TABLES #undef OF_HAVE__THREAD_LOCAL #undef OF_HAVE___THREAD +#undef OF_NINTENDO_3DS #undef OF_NINTENDO_DS #undef OF_OBJFW_RUNTIME #undef OF_UNIVERSAL +#undef OF_WII #undef SIZE_MAX #undef UINTPTR_MAX #undef ULLONG_MAX #undef __have_longlong64 Index: src/platform.h ================================================================== --- src/platform.h +++ src/platform.h @@ -136,12 +136,10 @@ # define OF_AMIGAOS #elif defined(__sun__) # define OF_SOLARIS #elif defined(__QNX__) # define OF_QNX -#elif defined(__wii__) -# define OF_WII #elif defined(_PSP) # define OF_PSP #elif defined(__DJGPP__) # define OF_DJGPP # define OF_MSDOS Index: utils/objfw-config.in ================================================================== --- utils/objfw-config.in +++ utils/objfw-config.in @@ -17,11 +17,11 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" libdir="@libdir@" CFLAGS="" -CPPFLAGS="-I@includedir@" +CPPFLAGS="@DEFINES@ @INCLUDES@ -I@includedir@" CXXFLAGS="" OBJC="@OBJC@" OBJCFLAGS="@NOIXEMUL@ @INTEGRATED_AS@ @RUNTIME_FLAGS@" OBJCFLAGS="$OBJCFLAGS -fexceptions -fobjc-exceptions -funwind-tables" OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstantString" @@ -28,12 +28,11 @@ OBJCFLAGS="$OBJCFLAGS @NO_CONST_CFSTRINGS@ @BLOCKS_FLAGS@" LIB_CFLAGS="@LIB_CFLAGS@" LIB_LDFLAGS="@LIB_LDFLAGS@" LIB_PREFIX="@LIB_PREFIX@" LIB_SUFFIX="@LIB_SUFFIX@" -LDFLAGS="@NOIXEMUL@ -fexceptions @ALLOW_MULTIPLE_DEFINITION@" -LDFLAGS="$LDFLAGS @WEAK_NSFOUNDATIONVERSIONNUMBER@" +LDFLAGS="@LDFLAGS@" LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@" LDFLAGS_RPATH="@LDFLAGS_RPATH@" LIBS="-L${libdir} -lobjfw @RUNTIME_LIBS@ @LIBS@" FRAMEWORK_LIBS="-F${prefix}/Library/Frameworks -framework ObjFW" FRAMEWORK_LIBS="$FRAMEWORK_LIBS @RUNTIME_FRAMEWORK_LIBS@ @LIBS@"