alice.mosphere.at / TIC-80
this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Enforce certain mruby toolchains from CMake side

Jeremiasz Nelz 14fcb213 0b75c4e6

+5 -1
+4
CMakeLists.txt
··· 244 244 set(MRUBY_LIB ${MRUBY_DIR}/build/target/lib/libmruby.a) 245 245 if(EMSCRIPTEN) 246 246 set(MRUBY_TOOLCHAIN emscripten) 247 + set(MRUBY_CROSS_TOOLCHAIN emscripten) 248 + elseif(MSVC) 249 + set(MRUBY_TOOLCHAIN visualcpp) 247 250 endif() 248 251 249 252 ExternalProject_Add(mruby_vendor ··· 261 264 "TARGET_LDFLAGS=${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_LINKER_FLAGS_${BUILD_TYPE_UC}}" 262 265 "BUILD_TYPE=${BUILD_TYPE_UC}" 263 266 "MRUBY_TOOLCHAIN=${MRUBY_TOOLCHAIN}" 267 + "MRUBY_CROSS_TOOLCHAIN=${MRUBY_CROSS_TOOLCHAIN}" 264 268 INSTALL_COMMAND "" 265 269 BUILD_BYPRODUCTS ${MRUBY_LIB} 266 270 )
+1 -1
mruby/tic_default.rb
··· 18 18 conf.archiver.command = ENV['TARGET_AR'] || 'emar' 19 19 end 20 20 21 - BuildClazz = (ENV['MRUBY_TOOLCHAIN'] || '').empty? ? MRuby::Build : MRuby::CrossBuild 21 + BuildClazz = (ENV['MRUBY_CROSS_TOOLCHAIN'] || '').empty? ? MRuby::Build : MRuby::CrossBuild 22 22 23 23 BuildClazz.new('target') do |conf| 24 24 # load specific toolchain settings