15 lines
715 B
Diff
15 lines
715 B
Diff
Binary files luacom-org/.git/index and luacom/.git/index differ
|
|
diff -rup luacom-org/CMakeLists.txt luacom/CMakeLists.txt
|
|
--- luacom-org/CMakeLists.txt 2016-01-07 13:09:06.994305000 +0800
|
|
+++ luacom/CMakeLists.txt 2016-01-08 08:07:54.227239700 +0800
|
|
@@ -63,6 +63,9 @@ if ( HAVE_HTMLHELP )
|
|
set ( LIBS ${LIBS} htmlhelp )
|
|
endif ( )
|
|
|
|
+SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR>")
|
|
+SET(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR>")
|
|
+
|
|
add_lua_bin2c ( ${CMAKE_CURRENT_BINARY_DIR}/luacom5.loh src/library/luacom5.lua ${CMAKE_CURRENT_SOURCE_DIR}/mak/bin2c.lua
|
|
${CMAKE_CURRENT_SOURCE_DIR}/mak/luac.lua )
|
|
set_source_files_properties ( src/library/luacom.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/luacom5.loh )
|