Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated Makefile and make-deps.sh to latest glfw-rs

  • Loading branch information...
commit 605efa473ad2b8e940c85b7aa2710b5eac82a1a5 1 parent 0b43066
Andrey Lesnikov authored
Showing with 11 additions and 18 deletions.
  1. +1 −1  Makefile
  2. +10 −17 make_deps.sh
2  Makefile
View
@@ -3,7 +3,7 @@
# RUSTC_FLAGS += -g
# RUSTC_FLAGS += --opt-level 3
RUSTC_FLAGS += -L deps
-RUSTC_FLAGS += -C link-args=-lglfw
+# RUSTC_FLAGS += -C link-args=-lglfw
RUSTC = rustc ${RUSTC_FLAGS}
27 make_deps.sh
View
@@ -1,21 +1,19 @@
# See LICENSE file for copyright and license details.
#!/bin/sh
+set -e
echo Creating 'deps' dir...
mkdir deps
-cd deps
-
-echo === glfw3 ===
-git clone --depth=1 https://github.com/glfw/glfw.git
-cd glfw
-cmake -DBUILD_SHARED_LIBS=ON
-make glfw # build without examples or tests
-cp src/libglfw.so* .. # copy dynamic libraries to 'deps' dir
-cd ..
+cd deps # '.' -> './deps'
echo === glfw-rs ===
git clone --depth=1 https://github.com/bjz/glfw-rs
-rustc glfw-rs/src/lib/lib.rs --out-dir .
+cd glfw-rs
+git clone --depth=1 https://github.com/glfw/glfw.git
+cd glfw; cmake -DBUILD_SHARED_LIBS=ON; make glfw; cp src/lib*.so* ..; cd ..
+PKG_CONFIG_PATH=glfw/src make lib
+cp lib/*.rlib lib/*.so *.so* ..
+cd ..
echo === gl-rs ===
git clone --depth=1 https://github.com/bjz/gl-rs
@@ -27,13 +25,8 @@ rustc cgmath-rs/src/cgmath/lib.rs --out-dir .
echo === rust-stb-image ===
git clone --depth=1 https://github.com/mozilla-servo/rust-stb-image
-cd rust-stb-image
-./configure
-make
-cp *.rlib *.a ..
-cd ..
+cd rust-stb-image; ./configure; make; cp *.rlib *.a ..; cd ..
-# Return from 'deps' dir
-cd ..
+cd .. # './deps' -> '.'
echo Done!
Please sign in to comment.
Something went wrong with that request. Please try again.