Re-arrange libscript to avoid a clash with the QuickTime SDK headers

livecodefraser · livecodefraser · commit 4fc4167a37a9 · 2015-06-12T11:58:15.000+01:00
diff --git a/engine/src/dsklnxmain.cpp b/engine/src/dsklnxmain.cpp
@@ -29,7 +29,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "globals.h"
 #include "util.h"
 #include "variable.h"
-#include "script.h"
+#include "libscript/script.h"
 
 #include <locale.h>
 #include <langinfo.h>
diff --git a/engine/src/dskw32main.cpp b/engine/src/dskw32main.cpp
@@ -28,7 +28,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "mcerror.h"
 #include "globals.h"
 #include "util.h"
-#include "script.h"
+#include "libscript/script.h"
 
 #include <msctf.h>
 
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -48,7 +48,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #include "uuid.h"
 
-#include "script.h"
+#include "libscript/script.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/engine/src/exec-extension.cpp b/engine/src/exec-extension.cpp
@@ -48,7 +48,7 @@
 
 #include "uuid.h"
 
-#include "script.h"
+#include "libscript/script.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/engine/src/mac-core.mm b/engine/src/mac-core.mm
@@ -25,7 +25,7 @@
 
 #include "graphics_util.h"
 
-#include "script.h"
+#include "libscript/script.h"
 
 #include <objc/objc-runtime.h>
 
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -52,7 +52,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include <GLES/gl.h>
 #include <unistd.h>
 
-#include "script.h"
+#include "libscript/script.h"
 
 extern "C" bool MCModulesInitialize();
 
diff --git a/engine/src/mbliphoneapp.mm b/engine/src/mbliphoneapp.mm
@@ -30,7 +30,7 @@
 #include "mblnotification.h"
 #import <sys/utsname.h>
 
-#include "script.h"
+#include "libscript/script.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -64,7 +64,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include "resolution.h"
-#include "script.h"
+#include "libscript/script.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/engine/src/module-resources.cpp b/engine/src/module-resources.cpp
@@ -17,7 +17,7 @@
 #include "prefix.h"
 
 #include "module-resources.h"
-#include "script.h"
+#include "libscript/script.h"
 
 #include "filepath.h"
 #include "foundation-auto.h"
diff --git a/engine/src/srvmain.cpp b/engine/src/srvmain.cpp
@@ -39,7 +39,7 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "util.h"
 #include "uidc.h"
 #include "font.h"
-#include "script.h"
+#include "libscript/script.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/engine/src/widget.h b/engine/src/widget.h
@@ -20,7 +20,7 @@
 #include "control.h"
 #include "native-layer.h"
 
-#include "script.h"
+#include "libscript/script.h"
 
 
 class MCWidget: public MCControl
diff --git a/libscript/include/libscript/script-auto.h b/libscript/include/libscript/script-auto.h
diff --git a/libscript/include/libscript/script.h b/libscript/include/libscript/script.h
diff --git a/libscript/libscript.gyp b/libscript/libscript.gyp
@@ -9,8 +9,8 @@
 	{
 		'libscript_public_headers':
 		[
-			'include/script.h',
-			'include/script-auto.h',
+			'include/libscript/script.h',
+			'include/libscript/script-auto.h',
 		],
 		
 		'libscript_private_headers':
diff --git a/libscript/src/script-builder.cpp b/libscript/src/script-builder.cpp
@@ -16,7 +16,7 @@
 
 #include <foundation.h>
 
-#include "script.h"
+#include "libscript/script.h"
 #include "script-private.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -14,7 +14,7 @@
  You should have received a copy of the GNU General Public License
  along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
-#include "script.h"
+#include "libscript/script.h"
 #include "script-private.h"
 
 #include "ffi.h"
diff --git a/libscript/src/script-module.cpp b/libscript/src/script-module.cpp
@@ -17,7 +17,7 @@
 #include <foundation.h>
 #include <foundation-auto.h>
 
-#include "script.h"
+#include "libscript/script.h"
 #include "script-private.h"
 
 #include <stddef.h>
diff --git a/libscript/src/script-object.cpp b/libscript/src/script-object.cpp
@@ -14,7 +14,7 @@
  You should have received a copy of the GNU General Public License
  along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
-#include "script.h"
+#include "libscript/script.h"
 #include "script-private.h"
 
 #include "foundation-auto.h"
diff --git a/libscript/src/script-package.cpp b/libscript/src/script-package.cpp
@@ -14,7 +14,7 @@
  You should have received a copy of the GNU General Public License
  along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
-#include "script.h"
+#include "libscript/script.h"
 #include "script-private.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/toolchain/lc-compile/src/emit.cpp b/toolchain/lc-compile/src/emit.cpp
@@ -16,8 +16,8 @@
 
 #include "foundation.h"
 #include "foundation-auto.h"
-#include "script.h"
-#include "script-auto.h"
+#include "libscript/script.h"
+#include "libscript/script-auto.h"
 
 #include "report.h"
 #include "literal.h"
diff --git a/toolchain/lc-compile/src/lc-run.cpp b/toolchain/lc-compile/src/lc-run.cpp
@@ -18,8 +18,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include <foundation.h>
 #include <foundation-system.h>
 #include <foundation-auto.h>
-#include <script.h>
-#include <script-auto.h>
+#include <libscript/script.h>
+#include <libscript/script-auto.h>
 
 #if defined(__WINDOWS__)
 #	include <windows.h>
