diff --git a/.travis.yml b/.travis.yml
index 77c39d2351..1d9d2612f0 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Makefile b/Makefile
index 168de14f50..384e550d12 100644
--- a/Makefile
+++ b/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 \
diff --git a/configure b/configure
index 0b9115a4e7..56314d9d51 100755
--- a/configure
+++ b/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
\ No newline at end of file
diff --git a/thirdparty/linux/Eluant.dll.config b/thirdparty/linux/Eluant.dll.config
deleted file mode 100644
index 5e2566f319..0000000000
--- a/thirdparty/linux/Eluant.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/thirdparty/linux/SDL2-CS.dll.config b/thirdparty/linux/SDL2-CS.dll.config
deleted file mode 100644
index 85bfbbec94..0000000000
--- a/thirdparty/linux/SDL2-CS.dll.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/thirdparty/linux/libSDL232.2.0.2.so b/thirdparty/linux/libSDL232.2.0.2.so
deleted file mode 100755
index bc1b543bf4..0000000000
Binary files a/thirdparty/linux/libSDL232.2.0.2.so and /dev/null differ
diff --git a/thirdparty/linux/libSDL264.2.0.2.so b/thirdparty/linux/libSDL264.2.0.2.so
deleted file mode 100755
index 50e49f85d6..0000000000
Binary files a/thirdparty/linux/libSDL264.2.0.2.so and /dev/null differ
diff --git a/thirdparty/linux/liblua32.5.1.5.so b/thirdparty/linux/liblua32.5.1.5.so
deleted file mode 100644
index 89f88a4051..0000000000
Binary files a/thirdparty/linux/liblua32.5.1.5.so and /dev/null differ
diff --git a/thirdparty/linux/liblua64.5.1.5.so b/thirdparty/linux/liblua64.5.1.5.so
deleted file mode 100644
index cc94bfac38..0000000000
Binary files a/thirdparty/linux/liblua64.5.1.5.so and /dev/null differ