[Scummvm-git-logs] scummvm master -> 14c1651a119373c77595d966d06bdaea7c4e3c88

[bonki]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
925025ec54 DS: Only disable forbidden symbols when necessary
14c1651a11 DS: Use -isystem when adding include directories for portlibs


Commit: 925025ec54bd27678f3b0c0d5f69d80636b073f5
    https://github.com/scummvm/scummvm/commit/925025ec54bd27678f3b0c0d5f69d80636b073f5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-04-07T22:12:18Z

Commit Message:
DS: Only disable forbidden symbols when necessary

Changed paths:
    backends/platform/ds/arm9/source/dsmain.cpp
    backends/platform/ds/arm9/source/osystem_ds.cpp
    backends/platform/ds/arm9/source/osystem_ds.h
    backends/plugins/ds/ds-provider.cpp


diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp
index e44e360..42708d2 100644
--- a/backends/platform/ds/arm9/source/dsmain.cpp
+++ b/backends/platform/ds/arm9/source/dsmain.cpp
@@ -68,8 +68,9 @@
 // - Try discworld?
 
 
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
-
+// Allow use of stuff in <nds.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 
 
 #include <nds.h>
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 03d336e..c35433d 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -23,7 +23,9 @@
 
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+// Allow use of stuff in <nds.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 
 #include "common/scummsys.h"
 #include "common/system.h"
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 585f72b..c8698ca 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -24,7 +24,9 @@
 #ifndef _OSYSTEM_DS_H_
 #define _OSYSTEM_DS_H_
 
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+// Allow use of stuff in <nds.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 
 #include "backends/base-backend.h"
 #include "common/events.h"
diff --git a/backends/plugins/ds/ds-provider.cpp b/backends/plugins/ds/ds-provider.cpp
index b21c483..c5419a9 100644
--- a/backends/plugins/ds/ds-provider.cpp
+++ b/backends/plugins/ds/ds-provider.cpp
@@ -20,7 +20,9 @@
  *
  */
 
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
+// Allow use of stuff in <nds.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 
 #include "common/scummsys.h"
 


Commit: 14c1651a119373c77595d966d06bdaea7c4e3c88
    https://github.com/scummvm/scummvm/commit/14c1651a119373c77595d966d06bdaea7c4e3c88
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-04-07T22:12:18Z

Commit Message:
DS: Use -isystem when adding include directories for portlibs

Changed paths:
    configure


diff --git a/configure b/configure
index 2408e3f..e6ffba5 100755
--- a/configure
+++ b/configure
@@ -2570,8 +2570,8 @@ case $_host_os in
 		append_var DEFINES "-DARM"
 		append_var DEFINES "-DNONSTANDARD_PORT"
 		append_var CXXFLAGS "-isystem $DEVKITPRO/libnds/include"
-		append_var CXXFLAGS "-I$DEVKITPRO/portlibs/nds/include"
-		append_var CXXFLAGS "-I$DEVKITPRO/portlibs/armv5te/include"
+		append_var CXXFLAGS "-isystem $DEVKITPRO/portlibs/nds/include"
+		append_var CXXFLAGS "-isystem $DEVKITPRO/portlibs/armv5te/include"
 		append_var CXXFLAGS "-mcpu=arm9tdmi"
 		append_var CXXFLAGS "-mtune=arm9tdmi"
 		append_var CXXFLAGS "-fomit-frame-pointer"