Merge pull request #1 from Necktrox/master

Update for solution, build scripts and sockets module

Author: Jusonex

sockets/build.sh renamed to sockets/build-32.sh

@@ -1,22 +1,22 @@
 #########################
 # Remove old binary
 #########################
-if [ -e "ml_sockets.so" ]; then
-    rm ml_sockets.so
+if [ -e "./x32/ml_sockets.so" ]; then
+    rm ./x32/ml_sockets.so
 fi
 
 #########################
 # Prepare build
 #########################
 autoreconf -ifv
-./configure CXXFLAGS='-g -O2 -fPIC'
+./configure CXXFLAGS='-m32 -g -O2 -fPIC' CFLAGS='-m32' LDFLAGS='-m32'
 make clean
 
 #########################
 # Do build
 #########################
 echo Building...
-make >_make.log
+make >_make-32.log
 
 #########################
 # Check for error
@@ -30,6 +30,7 @@ fi
 #########################
 # Copy binary file
 #########################
-cp src/.libs/libml_sockets.so ./ml_sockets.so
-echo "Build completed "`pwd`"/ml_sockets.so"
+mkdir x32
+cp src/.libs/libml_sockets.so ./x32/ml_sockets.so
+echo "Build completed "`pwd`"/x32/ml_sockets.so"
 exit 0

sockets/build-64.sh

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

sockets/configure.ac

@@ -4,6 +4,8 @@
 AC_PREREQ(2.60)
 AC_INIT(ml_sockets.so, 0.1)
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+LT_INIT
 AC_CONFIG_SRCDIR([include/lua.h])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_FILES([Makefile luaimports/Makefile src/Makefile])

sockets/ml_sockets.sln

@@ -1,6 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml_sockets", "ml_sockets.vcproj", "{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2012 for Windows Desktop
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml_sockets", "ml_sockets.vcxproj", "{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution