Add a server variant of the revdb external

livecodefraser · livecodefraser · commit 0d218c733ce9 · 2015-04-01T11:51:28.000+01:00
diff --git a/livecode.gyp b/livecode.gyp
@@ -36,6 +36,9 @@
 				'revvideograbber/revvideograbber.gyp:revvideograbber',
 				'revxml/revxml.gyp:revxml',
 				'revzip/revzip.gyp:revzip',
+				
+				# Server externals
+				'revdb/revdb.gyp:revdb-server',
 			],
 		},
 	],
diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp
@@ -4,6 +4,19 @@
 		'../common.gypi',
 	],
 	
+	'variables':
+	{
+		'revdb_sources':
+		[
+			'src/revdb.cpp',
+			'src/osxsupport.cpp',
+			'src/unxsupport.cpp',
+			'src/w32support.cpp',
+			'src/database.cpp',
+			'src/dbdrivercommon.cpp',
+		],
+	},
+	
 	'targets':
 	[
 		{
@@ -158,18 +171,38 @@
 			
 			'sources':
 			[
-				'src/revdb.cpp',
-				'src/osxsupport.cpp',
-				'src/unxsupport.cpp',
-				'src/w32support.cpp',
-				'src/database.cpp',
-				'src/dbdrivercommon.cpp',
+				'<@(revdb_sources)',
 			],
 			
 			'xcode_settings':
 			{
 				'INFOPLIST_FILE': 'rsrc/revdb-Info.plist',
 			},
 		},
+		{
+			'target_name': 'revdb-server',
+			'type': 'loadable_module',
+			
+			'variables':
+			{
+				'server_mode': 1,
+			},
+			
+			'dependencies':
+			[
+				'../libcore/libcore.gyp:libCore',
+				'../libexternal/libexternal.gyp:libExternal',
+			],
+			
+			'include_dirs':
+			[
+				'src',
+			],
+			
+			'sources':
+			[
+				'<@(revdb_sources)',
+			],
+		},
 	],
 }
diff --git a/revdb/src/dbdrivercommon.cpp b/revdb/src/dbdrivercommon.cpp
@@ -18,9 +18,9 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS) || defined(_WINDOWS_SERVER)
 #define LIBRARY_EXPORT __declspec(dllexport)
-#elif defined(_MACOSX)
+#elif defined(_MACOSX) || defined (_MAC_SERVER)
 #define LIBRARY_EXPORT
-#elif defined(_LINUX)
+#elif defined(_LINUX) || defined (_LINUX_SERVER)
 #define LIBRARY_EXPORT
 #elif defined(TARGET_SUBPLATFORM_IPHONE) || defined(TARGET_SUBPLATFORM_ANDROID)
 #define LIBRARY_EXPORT
diff --git a/revdb/src/revdb.cpp b/revdb/src/revdb.cpp
@@ -23,9 +23,9 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 #if defined(_WINDOWS) || defined(_WINDOWS_SERVER)
 #include "w32support.h"
-#elif defined(_LINUX) || defined(TARGET_SUBPLATFORM_ANDROID)
+#elif defined(_LINUX) || defined(_LINUX_SERVER) || defined(TARGET_SUBPLATFORM_ANDROID)
 #include "unxsupport.h"
-#elif defined(_MACOSX)
+#elif defined(_MACOSX) || defined (_MAC_SERVER)
 #include "osxsupport.h"
 #elif defined(TARGET_SUBPLATFORM_IPHONE)
 #include "iossupport.h"
