Browse Source

Also use DESTDIR when installing SDK on MinGW.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
3bc39c30c6
2 changed files with 2 additions and 2 deletions
  1. 1 1
      CMakeLists.txt
  2. 1 1
      Rakefile

+ 1 - 1
CMakeLists.txt

@@ -131,7 +131,7 @@ if (NOT DEFINED ENV{RELEASE_TAG})
 endif ()
 include (CPack)
 
-# Setup SDL-like include dir in the build tree
+# Setup SDK-like include dir in the build tree
 foreach (DIR Direct3D9 OpenGL SDL)
     file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/${DEST_INCLUDE_DIR}/${DIR})
 endforeach ()

+ 1 - 1
Rakefile

@@ -387,7 +387,7 @@ def makefile_ci
   system "export URHO3D_HOME=../.. && cd ../Build/generated/UsingBuildTree && echo '\nExternal project referencing Urho3D library in its build tree' && ./cmake_generic.sh . #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing} -DCMAKE_BUILD_TYPE=#{$configuration} && make -j$NUMJOBS #{test}" or abort 'Failed to configure/build/test temporary project using Urho3D as external library' 
   puts "\nInstalling Urho3D SDK...\n"
   # Create a new project on the fly that uses newly installed Urho3D SDK
-  install_destination = ENV['LINUX'] || ENV['OSX'] ? 'DESTDIR=~ && export URHO3D_HOME=~/usr/local' : ''
+  install_destination = ENV['LINUX'] || ENV['WINDOWS'] || ENV['OSX'] ? 'DESTDIR=~ && export URHO3D_HOME=~/usr/local' : ''
   scaffolding "../Build/generated/UsingSDK"
   system "cd ../Build && make -j$NUMJOBS install >/dev/null #{install_destination} && cd ../Build/generated/UsingSDK && echo '\nExternal project referencing Urho3D SDK' && ./cmake_generic.sh . #{$build_options} -DURHO3D_LUA#{jit}=1 -DURHO3D_TESTING=#{$testing} -DCMAKE_BUILD_TYPE=#{$configuration} && make -j$NUMJOBS #{test}" or abort 'Failed to configure/build/test temporary project using Urho3D as external library'
   # Make, deploy, and test run Android APK in an Android (virtual) device