Added 64 bit build stuff

Author: ccw808

mta-mysql/build.sh

@@ -0,0 +1,35 @@
+#########################
+# Remove old binary
+#########################
+if [ -e "mta_mysql.so" ]; then
+    rm mta_mysql.so
+fi
+
+#########################
+# Prepare build
+#########################
+autoreconf -ifv
+./configure CXXFLAGS='-g -O2 -fPIC'
+make clean
+
+#########################
+# Do build
+#########################
+echo Building...
+make >_make.log
+
+#########################
+# Check for error
+#########################
+rc=$?
+if [ $rc -ne 0 ]; then
+    echo "Stopping: make returned error code $rc"
+    exit 1
+fi
+
+#########################
+# Copy binary file
+#########################
+cp src/.libs/libmta_mysql.so ./mta_mysql.so
+echo "Build completed "`pwd`"/mta_mysql.so"
+exit 0

mta-mysql/include/common.h

@@ -29,6 +29,22 @@ extern "C"
   #define MTAEXPORT extern "C"
 #endif
 
+#if defined( _M_X64 ) || defined( __x86_64__ ) || defined( _M_AMD64 )
+    #define ANY_x64
+    #ifdef _WIN64
+        #define WIN_x64
+    #else
+        #define LINUX_x64
+    #endif
+#else
+    #define ANY_x86
+    #ifdef WIN32
+        #define WIN_x86
+    #else
+        #define LINUX_x86
+    #endif
+#endif
+
 #include <list>
 #include <vector>
 // Obviously i can't get us this so other includes will most likely be needed later on

mta-mysql/lib/x64/libmysql.lib

@@ -208,20 +208,24 @@ static void* pluaL_pushresult = 0;
   p ## x = dlsym(dl, #x); \
   if (p ## x == 0) \
   { \
-    pModuleManager->Printf("Unable to import " #x ": %s\n", dlerror()); \
-    return; \
+    pModuleManager->Printf("[mta-mysql] Unable to import " #x ": %s\n", dlerror()); \
+    return false; \
   }
 
 #ifdef __cplusplus
 extern "C"
 #endif
-void ImportLua()
+bool ImportLua()
 {
+#ifdef ANY_x64
+  void* dl = dlopen("x64/deathmatch.so", RTLD_NOW | RTLD_NOLOAD);
+#else
   void* dl = dlopen("mods/deathmatch/deathmatch.so", RTLD_NOW | RTLD_NOLOAD);
+#endif
   if (!dl)
   {
-    pModuleManager->Printf("Unable to open deathmatch.so: %s\n", dlerror());
-    return;
+    pModuleManager->ErrorPrintf("[mta-mysql] Unable to open deathmatch.so: %s\n", dlerror());
+    return false;
   }
 
   /*
@@ -386,6 +390,7 @@ void ImportLua()
   SAFE_IMPORT(luaL_addstring);
   SAFE_IMPORT(luaL_addvalue);
   SAFE_IMPORT(luaL_pushresult);
+    return true;
 }
 #undef SAFE_IMPORT
 

mta-mysql/lib/x64/lua5.1.lib

@@ -29,10 +29,10 @@
  */
 
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
-#define ImportLua() while(0)
+#define ImportLua() true
 #else
 #ifdef __cplusplus
 extern "C"
 #endif
-void ImportLua();
+bool ImportLua();
 #endif

mta-mysql/luaimports/luaimports.cpp

@@ -5,13 +5,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Debug|Win32.Build.0 = Debug|Win32
+		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Debug|x64.ActiveCfg = Debug|x64
+		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Debug|x64.Build.0 = Debug|x64
 		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Release|Win32.ActiveCfg = Release|Win32
 		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Release|Win32.Build.0 = Release|Win32
+		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Release|x64.ActiveCfg = Release|x64
+		{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE