diff options
| author | Cameron Cawley | 2017-11-14 23:00:56 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-04-07 09:30:07 +0200 |
| commit | 9111998c49958646a9216548b9c886136afd7c14 (patch) | |
| tree | b54641021cc27c9c9d3960001f929e8639a5bb2f /configure | |
| parent | 668084c58a2267897f58eb6a6d9baac09b65969d (diff) | |
| download | scummvm-rg350-9111998c49958646a9216548b9c886136afd7c14.tar.gz scummvm-rg350-9111998c49958646a9216548b9c886136afd7c14.tar.bz2 scummvm-rg350-9111998c49958646a9216548b9c886136afd7c14.zip | |
DS: Fix compilation with devkitARM r47
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -1476,7 +1476,7 @@ dreamcast) ds) _host_os=ds _host_cpu=arm - _host_alias=arm-eabi + _host_alias=arm-none-eabi ;; gamecube) _host_os=gamecube @@ -2555,7 +2555,8 @@ case $_host_os in append_var DEFINES "-DARM" append_var DEFINES "-DNONSTANDARD_PORT" append_var CXXFLAGS "-isystem $DEVKITPRO/libnds/include" - append_var CXXFLAGS "-isystem $DEVKITPRO/devkitARM/arm-eabi/include" + append_var CXXFLAGS "-I$DEVKITPRO/portlibs/nds/include" + append_var CXXFLAGS "-I$DEVKITPRO/portlibs/armv5te/include" append_var CXXFLAGS "-mcpu=arm9tdmi" append_var CXXFLAGS "-mtune=arm9tdmi" append_var CXXFLAGS "-fomit-frame-pointer" @@ -2566,7 +2567,7 @@ case $_host_os in append_var CXXFLAGS "-fuse-cxa-atexit" append_var LDFLAGS "-specs=ds_arm9.specs" append_var LDFLAGS "-mthumb-interwork" - append_var LDFLAGS "-mno-fpu" + append_var LDFLAGS "-mfloat-abi=soft" append_var LDFLAGS "-Wl,-Map,map.txt" if test "$_dynamic_modules" = no ; then append_var LDFLAGS "-Wl,--gc-sections" @@ -2576,6 +2577,8 @@ case $_host_os in # append_var LDFLAGS "-Wl,--retain-symbols-file,ds.syms" fi append_var LDFLAGS "-L$DEVKITPRO/libnds/lib" + append_var LDFLAGS "-L$DEVKITPRO/portlibs/nds/lib" + append_var LDFLAGS "-L$DEVKITPRO/portlibs/armv5te/lib" append_var LIBS "-lnds9" ;; freebsd*) @@ -3727,7 +3730,7 @@ POST_OBJS_FLAGS := -Wl,--no-whole-archive append_var DEFINES "-DUNCACHED_PLUGINS" append_var DEFINES "-DELF_NO_MEM_MANAGER" _mak_plugins=' -PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwork -mno-fpu +PLUGIN_LDFLAGS += -Wl,-T$(srcdir)/backends/plugins/ds/plugin.ld -mthumb-interwork -mfloat-abi=soft ' ;; freebsd*) @@ -5232,6 +5235,7 @@ cat > config.h << EOF $_config_h_data /* Data types */ +#ifndef SCUMMVM_DONT_DEFINE_TYPES typedef unsigned $type_1_byte byte; typedef unsigned int uint; typedef unsigned $type_1_byte uint8; @@ -5242,6 +5246,7 @@ typedef signed $type_1_byte int8; typedef signed $type_2_byte int16; typedef signed $type_4_byte int32; typedef signed $type_8_byte int64; +#endif typedef $type_ptr uintptr; |