Remove linux native libraries and automate configure.

.travis.yml

@@ -16,7 +16,7 @@ cache: apt
 # Run the build script
 # call RALint to check for YAML errors
 script:
- - make dependencies
+ - make cli-dependencies
  - make all
  - make test
 

Makefile

@@ -270,11 +270,6 @@ clean:
 
 distclean: clean
 
-platformdeps = "linux"
-ifeq ($(shell uname),Darwin)
-	platformdeps = "osx"
-endif
-
 dependencies: cli-dependencies native-dependencies
 
 cli-dependencies:
@@ -282,7 +277,7 @@ cli-dependencies:
 	@ $(CP_R) thirdparty/*.dll.config .
 
 native-dependencies:
-	@ $(CP_R) thirdparty/${platformdeps}/* .
+	@./configure
 
 version: mods/ra/mod.yaml mods/cnc/mod.yaml mods/d2k/mod.yaml mods/modchooser/mod.yaml
 	@for i in $? ; do \

configure

@@ -21,4 +21,7 @@ if [ "$os" == 'Linux' ]; then
 		sed "s/@LIBLUA51@/${liblua51}/" thirdparty/Eluant.dll.config.in > Eluant.dll.config
 		echo "Eluant.dll.config has been created successfully."
 	fi
+elif [ "$os" == 'Darwin' ]; then
+	cp thirdparty/osx/* .
+	echo "Copied Lua 5.1 and SDL2 libraries successfully."
 fi

thirdparty/linux/Eluant.dll.config

@@ -1,4 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="lua51.dll" cpu="x86" target="liblua32.5.1.5.so" />
-  <dllmap os="linux" dll="lua51.dll" cpu="x86-64" target="liblua64.5.1.5.so" />
-</configuration>

thirdparty/linux/SDL2-CS.dll.config

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <dllmap os="linux" dll="SDL2.dll" cpu="x86" target="libSDL232.2.0.2.so" />
-  <dllmap os="linux" dll="SDL2.dll" cpu="x86-64" target="libSDL264.2.0.2.so" />
-
-  <dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
-
-  <dllmap dll="opengl32.dll">
-    <dllentry os="linux" dll="libGL.so.1" />
-  </dllmap>
-
-  <dllmap dll="glu32.dll">
-    <dllentry os="linux" dll="libGLU.so.1" />
-  </dllmap>
-</configuration>