[Ttssh2-commit] [7690] mingwでビルドできなくなっていたので修正

scmno****@osdn***** scmno****@osdn*****
2019年 5月 20日 (月) 00:03:34 JST


Revision: 7690
          https://osdn.net/projects/ttssh2/scm/svn/commits/7690
Author:   zmatsuo
Date:     2019-05-20 00:03:33 +0900 (Mon, 20 May 2019)
Log Message:
-----------
mingwでビルドできなくなっていたので修正

Modified Paths:
--------------
    branches/cmake/CMakeLists.txt
    branches/cmake/teraterm/common/dllutil.cpp

-------------- next part --------------
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt	2019-05-19 14:14:51 UTC (rev 7689)
+++ branches/cmake/CMakeLists.txt	2019-05-19 15:03:33 UTC (rev 7690)
@@ -41,10 +41,8 @@
 elseif(MINGW)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=${_WIN32_WINNT}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra "
-    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra "
-    "-Wno-unused-parameter -static -ffunction-sections -fdata-sections")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections ${C_ONLY_FLAGS}")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter -static -ffunction-sections -fdata-sections")
   if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc -static-libstdc++")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")

Modified: branches/cmake/teraterm/common/dllutil.cpp
===================================================================
--- branches/cmake/teraterm/common/dllutil.cpp	2019-05-19 14:14:51 UTC (rev 7689)
+++ branches/cmake/teraterm/common/dllutil.cpp	2019-05-19 15:03:33 UTC (rev 7690)
@@ -162,7 +162,7 @@
 		*pFunc = NULL;
 		return ERROR_FILE_NOT_FOUND;
 	} else {
-		*pFunc = GetProcAddress(hDll, ApiName);
+		*pFunc = (void *)GetProcAddress(hDll, ApiName);
 		if (*pFunc == NULL) {
 			return ERROR_PROC_NOT_FOUND;
 		}


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