[Ttssh2-commit] [7267] add UNICOWS

scmno****@osdn***** scmno****@osdn*****
2018年 11月 18日 (日) 00:44:16 JST


Revision: 7267
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7267
Author:   zmatsuo
Date:     2018-11-18 00:44:15 +0900 (Sun, 18 Nov 2018)
Log Message:
-----------
add UNICOWS

Modified Paths:
--------------
    branches/cmake/teraterm/teraterm/CMakeLists.txt

-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/CMakeLists.txt
===================================================================
--- branches/cmake/teraterm/teraterm/CMakeLists.txt	2018-11-17 15:44:05 UTC (rev 7266)
+++ branches/cmake/teraterm/teraterm/CMakeLists.txt	2018-11-17 15:44:15 UTC (rev 7267)
@@ -1,5 +1,8 @@
 project(teraterm)
 
+option(USE_UNICODE_API "unicode" ON)
+option(LINK_UNICOWS "unicode APIs for 9x" ON)
+
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_SFMT.cmake)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../libs/lib_oniguruma.cmake)
 
@@ -10,11 +13,15 @@
   string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
 endif ()
 
-option(USE_UNICODE_API "unicode" ON)
 
 if(USE_UNICODE_API)
   add_definitions(-DUNICODE -D_UNICODE)
 endif()
+if(LINK_UNICOWS)
+#  set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/unicows_mingw/liblibunicows.a")
+  set(UNICOWS_LIB "${CMAKE_SOURCE_DIR}/libs/libunicows-1.1.2-msvc6/unicows.lib")
+endif()
+
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/")
 
 set(COMMON_SRC
@@ -140,7 +147,6 @@
   )
 
 link_directories(
-#  ${PROJECT_SOURCE_DIR}/libs/unicows_mingw/liblibunicows.a
   ${ONIGURUMA_LIBRARY_DIRS}
   ${SFMT_LIBRARY_DIRS}
   )
@@ -168,6 +174,7 @@
 
 target_link_libraries(
   teraterm
+  ${UNICOWS_LIB}
   ttpcmn
   ttpfile
   ttpset


Ttssh2-commit メーリングリストの案内