0.6.0 compatibility attempt 2

sebastien-bouffier · Mar 31, 2018 · 2ea537d · 2ea537d
1 parent 4f9c800
commit 2ea537d
Show file tree

Hide file tree

Showing 167 changed files with 11 additions and 102,132 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,4 @@ dist
 /src/dep/mpg123-1.25.8
 /src/dep/share
 *.bz2
+/dep
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dep/glfw"]
+	path = dep/glfw
+	url = https://github.com/glfw/glfw.git
diff --git a/Makefile b/Makefile
@@ -23,17 +23,18 @@ endif
 # Static libs
 mpg123 := dep/lib/libmpg123.a
 curl := dep/lib/libcurl.a
+openssl := dep/lib/ssl.a
 
 ifeq ($(ARCH), lin)
-	glfw := dep/lib/libglfw.a
+	glfw = dep/lib/libglfw.a
 endif
 
 ifeq ($(ARCH), mac)
-	glfw := dep/lib/libglfw.a
+	glfw = dep/lib/libglfw.a
 endif
 
 ifeq ($(ARCH), win)
-	glfw := dep/lib/libglfw3dll.a
+	glfw = dep/lib/libglfw3dll.a
 endif
 
 OBJECTS += $(mpg123) $(curl) $(glfw)
@@ -61,8 +62,8 @@ $(openssl):
 	cd dep && $(WGET) https://www.openssl.org/source/openssl-1.1.0g.tar.gz
 	cd dep && $(UNTAR) openssl-1.1.0g.tar.gz
 	cd dep/openssl-1.1.0g && ./config --prefix="$(realpath $(DEP_LOCAL))"
-	cd dep/openssl-1.1.0g $(MAKE)
-	cd dep/openssl-1.1.0g $(MAKE) install_sw
+	$(MAKE) -C dep/openssl-1.1.0g
+	$(MAKE) -C dep/openssl-1.1.0g install_sw
 
 $(curl): $(openssl)
 	cd dep && $(WGET) https://github.com/curl/curl/releases/download/curl-7_56_0/curl-7.56.0.tar.gz

diff --git a/dep/glfw b/dep/glfw
diff --git a/dep/glfw/.appveyor.yml b/dep/glfw/.appveyor.yml
diff --git a/dep/glfw/.gitattributes b/dep/glfw/.gitattributes
diff --git a/dep/glfw/.gitignore b/dep/glfw/.gitignore
diff --git a/dep/glfw/.travis.yml b/dep/glfw/.travis.yml
diff --git a/dep/glfw/CMake/GenerateMappings.cmake b/dep/glfw/CMake/GenerateMappings.cmake
diff --git a/dep/glfw/CMake/MacOSXBundleInfo.plist.in b/dep/glfw/CMake/MacOSXBundleInfo.plist.in
diff --git a/dep/glfw/CMake/amd64-mingw32msvc.cmake b/dep/glfw/CMake/amd64-mingw32msvc.cmake
diff --git a/dep/glfw/CMake/i586-mingw32msvc.cmake b/dep/glfw/CMake/i586-mingw32msvc.cmake
diff --git a/dep/glfw/CMake/i686-pc-mingw32.cmake b/dep/glfw/CMake/i686-pc-mingw32.cmake
diff --git a/dep/glfw/CMake/i686-w64-mingw32.cmake b/dep/glfw/CMake/i686-w64-mingw32.cmake
diff --git a/dep/glfw/CMake/modules/FindEpollShim.cmake b/dep/glfw/CMake/modules/FindEpollShim.cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,3 +8,4 @@ dist @@
     /src/dep/mpg123-1.25.8
     /src/dep/share
     *.bz2
+    /dep