Commit f7b43535 authored by nanahira's avatar nanahira

irrklang_64bit

parent fa20362b
...@@ -52,14 +52,14 @@ before_install: ...@@ -52,14 +52,14 @@ before_install:
sudo cp -rf ../../../include /usr/local/include/irrlicht; sudo cp -rf ../../../include /usr/local/include/irrlicht;
cd ../../../../; cd ../../../../;
fi fi
- curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-32bit-1.5.0.zip - curl --retry 5 --connect-timeout 30 --location --remote-header-name --remote-name http://www.ambiera.at/downloads/irrKlang-64bit-1.5.0.zip
- unzip -q irrKlang-32bit-1.5.0.zip - unzip -q irrKlang-64bit-1.5.0.zip
- mv -f irrKlang-1.5.0 irrklang - mv -f irrKlang-64bit-1.5.0 irrklang
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
cp -rf irrklang/bin/macosx-gcc/*.dylib .; cp -rf irrklang/bin/macosx-gcc/*.dylib .;
fi fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
cp -rf irrklang/bin/linux-gcc/*.so .; cp -rf irrklang/bin/linux-gcc-64/*.so .;
fi fi
script: script:
......
...@@ -35,8 +35,8 @@ project "ygopro" ...@@ -35,8 +35,8 @@ project "ygopro"
links { "event_pthreads", "GL", "dl", "pthread" } links { "event_pthreads", "GL", "dl", "pthread" }
configuration "linux" configuration "linux"
if USE_IRRKLANG then if USE_IRRKLANG then
linkoptions{ "-Wl,-rpath=./irrklang/bin/linux-gcc/" } linkoptions{ "-Wl,-rpath=./irrklang/bin/linux-gcc-64/" }
libdirs { "../irrklang/bin/linux-gcc" } libdirs { "../irrklang/bin/linux-gcc-64" }
end end
configuration "macosx" configuration "macosx"
if USE_IRRKLANG then if USE_IRRKLANG then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment