ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #214 from Eleuin/name-fixes 

Fix cmake directory in installdeps
This commit is contained in:
Zach Bacon 2018-04-02 12:23:11 -04:00 committed by GitHub
parent 80bcdab924 9843af2b5a
commit edb2fd2601
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
installdeps
View File

@ -252,7 +252,7 @@ check_cross() {
if [ -n "$msys2" ]; then if [ -n "$msys2" ]; then
target='mingw-w64-i686' target='mingw-w64-i686'
else else
cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-m32.cmake" cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-m32.cmake"
fi fi
;; ;;
m64) m64)
@ -456,11 +456,11 @@ fedora_installdeps() {
case "$target" in case "$target" in
mingw-w64-i686) mingw-w64-i686)
target=mingw32 target=mingw32
cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-i686.cmake -DENABLE_LINK=NO" cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-MinGW-w64-i686.cmake -DENABLE_LINK=NO"
;; ;;
mingw-w64-x86_64) mingw-w64-x86_64)
target=mingw64 target=mingw64
cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-x86_64.cmake -DENABLE_LINK=NO" cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-MinGW-w64-x86_64.cmake -DENABLE_LINK=NO"
;; ;;
*) *)
error 'unknown cross target (this should not happen)' error 'unknown cross target (this should not happen)'
@ -578,10 +578,10 @@ EOF
# windows cross build # windows cross build
case "$target" in case "$target" in
*i686*) *i686*)
cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-i686.cmake -DENABLE_LINK=NO" cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-MinGW-w64-i686.cmake -DENABLE_LINK=NO"
;; ;;
*x86_64*) *x86_64*)
cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../CMakeScripts/Toolchain-cross-MinGW-w64-x86_64.cmake -DENABLE_LINK=NO" cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-MinGW-w64-x86_64.cmake -DENABLE_LINK=NO"
;; ;;
*) *)
# this will never be reached, it's checked in check_cross() # this will never be reached, it's checked in check_cross()