diff options
| author | Leon Bottou <leon@bottou.org> | 2013-08-11 00:34:41 +0400 |
|---|---|---|
| committer | Leon Bottou <leon@bottou.org> | 2013-08-11 01:37:18 +0400 |
| commit | c56ea4dcccec96fcdd81c72b46e4a844ef61b6d9 (patch) | |
| tree | 8c651a745e0d85befca8dc302fb9a348ca0fef22 | |
| parent | c2765a592beb1a343a58b5cf512f84daf1547355 (diff) | |
added winqlua and wintorch
| -rw-r--r-- | qlua/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | qlua/qlua.cpp | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/qlua/CMakeLists.txt b/qlua/CMakeLists.txt index 221f2ac..b99c2c6 100644 --- a/qlua/CMakeLists.txt +++ b/qlua/CMakeLists.txt @@ -120,6 +120,9 @@ IF(WITH_QTLUA_IDE AND WIN32) ADD_EXECUTABLE(winqlua WIN32 ${qlua_SRC} qlua.rc) TARGET_LINK_LIBRARIES(winqlua ${QLUA_LIBRARIES} ${QT_QTMAIN_LIBRARY}) SET_TARGET_PROPERTIES(winqlua PROPERTIES COMPILE_FLAGS "-DWINQLUA") + ADD_EXECUTABLE(wintorch WIN32 ${qlua_SRC} qlua.rc) + TARGET_LINK_LIBRARIES(wintorch ${QLUA_LIBRARIES} ${QT_QTMAIN_LIBRARY}) + SET_TARGET_PROPERTIES(wintorch PROPERTIES COMPILE_FLAGS "-DWINQLUA -DTORCH7") ENDIF(WITH_QTLUA_IDE AND WIN32) IF(WITH_QTLUA_IDE AND APPLE) @@ -145,6 +148,10 @@ IF (WITH_QTLUA_IDE AND WIN32) RUNTIME DESTINATION ${QtLua_INSTALL_BIN_SUBDIR} LIBRARY DESTINATION ${QtLua_INSTALL_LIB_SUBDIR} ARCHIVE DESTINATION ${QtLua_INSTALL_LIB_SUBDIR} ) + INSTALL(TARGETS wintorch + RUNTIME DESTINATION ${QtLua_INSTALL_BIN_SUBDIR} + LIBRARY DESTINATION ${QtLua_INSTALL_LIB_SUBDIR} + ARCHIVE DESTINATION ${QtLua_INSTALL_LIB_SUBDIR} ) ENDIF(WITH_QTLUA_IDE AND WIN32) IF (WITH_QTLUA_IDE AND APPLE) diff --git a/qlua/qlua.cpp b/qlua/qlua.cpp index 321d348..548073c 100644 --- a/qlua/qlua.cpp +++ b/qlua/qlua.cpp @@ -132,6 +132,9 @@ main(int argc, char **argv) args_for_lua += const_cast<char*>("-lqtide"); args_for_lua += const_cast<char*>(ideStyle.constData()); } +#if defined(TORCH7) + args_for_lua += "-ltorch-env"; +#endif while(i < argc_for_both) args_for_lua += argv_for_both[i++]; while(argn < argc) |