feat(compiler): adapt non-msvc compiler

itas109 · Dec 16, 2024 · 191d5e0 · 191d5e0
1 parent fc5352d
commit 191d5e0
Show file tree

Hide file tree

Showing 20 changed files with 46 additions and 32 deletions.
diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt
@@ -35,7 +35,7 @@ endif ()
 add_library(${PROJECT_NAME} SHARED cserialport.cpp ${CSerialPortSourceFiles})
 
 if (WIN32)
-    target_link_libraries(${PROJECT_NAME} setupapi)
+    target_link_libraries(${PROJECT_NAME} user32 advapi32 setupapi)
 elseif (APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/bindings/csharp/CMakeLists.txt b/bindings/csharp/CMakeLists.txt
@@ -33,7 +33,7 @@ elseif (UNIX)
 endif ()
 
 if (WIN32)
-    link_libraries(setupapi)
+    link_libraries(user32 advapi32 setupapi)
 elseif (APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
@@ -39,7 +39,7 @@ include(UseJava) # add_jar
 include_directories(${JNI_INCLUDE_DIRS}) # jni.h
 
 if (WIN32)
-    link_libraries(setupapi)
+    link_libraries(user32 advapi32 setupapi)
 elseif (APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/bindings/javascript/CMakeLists.txt b/bindings/javascript/CMakeLists.txt
@@ -36,7 +36,7 @@ endif ()
 include_directories(${CMAKE_JS_INC}) # node.h
 
 if (WIN32)
-    link_libraries(setupapi)
+    link_libraries(user32 advapi32 setupapi)
 elseif (APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/bindings/nodejs/CMakeLists.txt b/bindings/nodejs/CMakeLists.txt
@@ -43,7 +43,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
 
 if (WIN32)
-	target_link_libraries( ${PROJECT_NAME} setupapi)
+	target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(${Python3_INCLUDE_DIRS})
 link_libraries(${Python3_LIBRARIES})
 
 if (WIN32)
-    link_libraries(setupapi)
+    link_libraries(user32 advapi32 setupapi)
 elseif (APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommElectron/CMakeLists.txt b/examples/CommElectron/CMakeLists.txt
@@ -49,7 +49,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
 
 if (WIN32)
-	target_link_libraries( ${PROJECT_NAME} setupapi)
+	target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommMFC/CMakeLists.txt b/examples/CommMFC/CMakeLists.txt
@@ -38,7 +38,7 @@ add_executable(${PROJECT_NAME} WIN32 ${MFCFiles} ${CSerialPortSourceFiles})
 
 if (WIN32)
     # for function availableFriendlyPorts
-    target_link_libraries( ${PROJECT_NAME} setupapi)
+    target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommNoGui/CMakeLists.txt b/examples/CommNoGui/CMakeLists.txt
@@ -55,7 +55,7 @@ else()
 
   if (WIN32)
 	# for function availableFriendlyPorts
-	target_link_libraries( ${PROJECT_NAME} setupapi)
+	target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
   elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommNoGui/Makefile b/examples/CommNoGui/Makefile
@@ -1,38 +1,41 @@
-CUR_DIR=.
+CUR_DIR = .
 
-DEMO_DIR=${CUR_DIR}
-SRC_DIR=${CUR_DIR}/../../src
+DEMO_DIR = ${CUR_DIR}
+SRC_DIR = ${CUR_DIR}/../../src
 
-INC_DIR=-I${CUR_DIR}/../../include
+INC_DIR = -I${CUR_DIR}/../../include
 
 
-SRC =   ${DEMO_DIR}/CSerialPortDemoNoGui.cpp \
-        ${SRC_DIR}/SerialPortInfo.cpp \
-	${SRC_DIR}/SerialPortInfoBase.cpp \
-      	${SRC_DIR}/SerialPortInfoUnixBase.cpp \
-	${SRC_DIR}/SerialPort.cpp \
-	${SRC_DIR}/SerialPortBase.cpp \
-	${SRC_DIR}/SerialPortUnixBase.cpp \
+SRC = ${DEMO_DIR}/CSerialPortDemoNoGui.cpp \
+      ${SRC_DIR}/SerialPortInfo.cpp \
+      ${SRC_DIR}/SerialPortInfoBase.cpp \
+      ${SRC_DIR}/SerialPortInfoUnixBase.cpp \
+      ${SRC_DIR}/SerialPort.cpp \
+      ${SRC_DIR}/SerialPortBase.cpp \
+      ${SRC_DIR}/SerialPortUnixBase.cpp
 
 OBJ = ${SRC}
 
 TARGET=CSerialPortDemoNoGui
+
 CC=g++
 
+# CSerialPort Debug Mode
+CCFLAGS += -DCSERIALPORT_DEBUG
+
 # include header
 CCFLAGS += ${INC_DIR}
 
 # pthread support
 CCFLAGS += -lpthread
 
-
 ${TARGET}: ${OBJ}
 	${CC} ${OBJ} ${CCFLAGS} -o ${TARGET}
 	@echo "Compile done."
 
 clean:
 	@rm -f *~ *.out
-	@echo "Clean tempreator files done."
+	@echo "Clean temporary files done."
 
 	@rm -f ${TARGET}
 	@echo "Clean target files done."

diff --git a/examples/CommNoGui/compile-Clang.bat b/examples/CommNoGui/compile-Clang.bat
@@ -2,8 +2,10 @@
 
 set path=D:\Program Files\LLVM\bin\;%path%
 
+REM clang version 18.1.8
+
 echo "Clang compile"
 
-clang++ CSerialPortDemoNoGui.cpp ../../src/SerialPortInfo.cpp ../../src/SerialPortInfoBase.cpp ../../src/SerialPortInfoWinBase.cpp ../../src/SerialPort.cpp ../../src/SerialPortBase.cpp ../../src/SerialPortWinBase.cpp -ladvapi32 -lsetupapi -I../../include -o CSerialPortDemoNoGui-Clang.exe
+clang++ CSerialPortDemoNoGui.cpp ../../src/SerialPortInfo.cpp ../../src/SerialPortInfoBase.cpp ../../src/SerialPortInfoWinBase.cpp ../../src/SerialPort.cpp ../../src/SerialPortBase.cpp ../../src/SerialPortWinBase.cpp -luser32 -ladvapi32 -lsetupapi -I../../include -o CSerialPortDemoNoGui-Clang.exe
 
 pause
diff --git a/examples/CommNoGui/compile-MSVC.bat b/examples/CommNoGui/compile-MSVC.bat
@@ -108,9 +108,9 @@ if %choice%==0 (
 )
 
 rem debug compile
-rem cl /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D _CONSOLE /D _LIB /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope  /Gd /TP /I "..\..\include" ..\..\src\SerialPort.cpp ..\..\src\SerialPortBase.cpp ..\..\src\SerialPortInfo.cpp ..\..\src\SerialPortInfoBase.cpp ..\..\src\SerialPortInfoWinBase.cpp ..\..\src\SerialPortWinBase.cpp CSerialPortDemoNoGui.cpp /link /OUT:"CSerialPortDemoNoGui-MSVC.exe" /INCREMENTAL /NOLOGO advapi32.lib setupapi.lib /SUBSYSTEM:CONSOLE /MACHINE:X86
+rem cl /ZI /nologo /W3 /WX- /Od /Oy- /D CSERIALPORT_DEBUG /D WIN32 /D _DEBUG /D _CONSOLE /D _LIB /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope  /Gd /TP /I "..\..\include" ..\..\src\SerialPort.cpp ..\..\src\SerialPortBase.cpp ..\..\src\SerialPortInfo.cpp ..\..\src\SerialPortInfoBase.cpp ..\..\src\SerialPortInfoWinBase.cpp ..\..\src\SerialPortWinBase.cpp CSerialPortDemoNoGui.cpp /link /OUT:"CSerialPortDemoNoGui-MSVC.exe" /INCREMENTAL /NOLOGO user32.lib advapi32.lib setupapi.lib /SUBSYSTEM:CONSOLE /MACHINE:X86
 
 rem release compile
-cl /Zi /nologo /W3 /WX- /O2 /Oi /Oy- /GL /D WIN32 /D NDEBUG /D _CONSOLE /D _LIB /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP /I "..\..\include" ..\..\src\SerialPort.cpp ..\..\src\SerialPortBase.cpp ..\..\src\SerialPortInfo.cpp ..\..\src\SerialPortInfoBase.cpp ..\..\src\SerialPortInfoWinBase.cpp ..\..\src\SerialPortWinBase.cpp CSerialPortDemoNoGui.cpp /link /OUT:"CSerialPortDemoNoGui-MSVC.exe" /INCREMENTAL /NOLOGO advapi32.lib setupapi.lib /SUBSYSTEM:CONSOLE /MACHINE:X86
+cl /Zi /nologo /W3 /WX- /O2 /Oi /Oy- /GL /D CSERIALPORT_DEBUG /D WIN32 /D NDEBUG /D _CONSOLE /D _LIB /D _UNICODE /D UNICODE /Gm- /EHsc /MD /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /TP /I "..\..\include" ..\..\src\SerialPort.cpp ..\..\src\SerialPortBase.cpp ..\..\src\SerialPortInfo.cpp ..\..\src\SerialPortInfoBase.cpp ..\..\src\SerialPortInfoWinBase.cpp ..\..\src\SerialPortWinBase.cpp CSerialPortDemoNoGui.cpp /link /OUT:"CSerialPortDemoNoGui-MSVC.exe" /INCREMENTAL /NOLOGO user32.lib advapi32.lib setupapi.lib /SUBSYSTEM:CONSOLE /MACHINE:X86
 
 pause
diff --git a/examples/CommNoGui/compile-MinGW.bat b/examples/CommNoGui/compile-MinGW.bat
@@ -1,9 +1,11 @@
 @ECHO OFF
 
-set path=D:\Qt\Qt5.12.9\Tools\mingw730_64\bin;%path%
+REM gcc version 8.1.0 (x86_64-posix-seh-rev0, Built by MinGW-W64 project)
+
+set path=D:\mingw64\bin;%path%
 
 echo "MinGW compile"
 
-g++ CSerialPortDemoNoGui.cpp ../../src/SerialPortInfo.cpp ../../src/SerialPortInfoBase.cpp ../../src/SerialPortInfoWinBase.cpp ../../src/SerialPort.cpp ../../src/SerialPortBase.cpp ../../src/SerialPortWinBase.cpp -lpthread -lsetupapi -I../../include -o CSerialPortDemoNoGui-MinGW
+g++ -DCSERIALPORT_DEBUG CSerialPortDemoNoGui.cpp ../../src/SerialPortInfo.cpp ../../src/SerialPortInfoBase.cpp ../../src/SerialPortInfoWinBase.cpp ../../src/SerialPort.cpp ../../src/SerialPortBase.cpp ../../src/SerialPortWinBase.cpp -lpthread -luser32 -ladvapi32 -lsetupapi -I../../include -o CSerialPortDemoNoGui-MinGW
 
 pause
diff --git a/examples/CommQT/CMakeLists.txt b/examples/CommQT/CMakeLists.txt
@@ -49,7 +49,7 @@ target_link_libraries(CommQT Qt5::Widgets)
 
 if (WIN32)
         # for function availableFriendlyPorts
-        target_link_libraries( ${PROJECT_NAME} setupapi)
+        target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommQT/CommQT.pro b/examples/CommQT/CommQT.pro
@@ -24,7 +24,7 @@ DEFINES += _UNICODE
 
 include($$PWD/commqt.pri)
 
-win32:LIBS += -lsetupapi
+win32:LIBS += -luser32 -ladvapi32 -lsetupapi
 unix:!macx:LIBS += -lpthread
 macx {
     LIBS += -framework IOKit

diff --git a/examples/CommWXWidgets/CMakeLists.txt b/examples/CommWXWidgets/CMakeLists.txt
@@ -39,7 +39,7 @@ target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
 
 if (WIN32)
     # for function availableFriendlyPorts
-    target_link_libraries( ${PROJECT_NAME} setupapi)
+    target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommWeb/CMakeLists.txt b/examples/CommWeb/CMakeLists.txt
@@ -49,7 +49,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
 
 if (WIN32)
-	target_link_libraries( ${PROJECT_NAME} setupapi)
+	target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/examples/CommWebview/CMakeLists.txt b/examples/CommWebview/CMakeLists.txt
@@ -49,7 +49,7 @@ endif ()
 add_executable(${PROJECT_NAME} main.cpp ${CSerialPortSourceFiles})
 
 if (WIN32)
-	target_link_libraries( ${PROJECT_NAME} setupapi)
+	target_link_libraries( ${PROJECT_NAME} user32 advapi32 setupapi)
 elseif(APPLE)
     find_library(IOKIT_LIBRARY IOKit)
     find_library(FOUNDATION_LIBRARY Foundation)

diff --git a/include/CSerialPort/SerialPortHotPlug_win32.hpp b/include/CSerialPort/SerialPortHotPlug_win32.hpp
@@ -19,6 +19,10 @@
 #include <tchar.h> // _T
 #define CLASS_NAME _T("itas109SerialPortChangeWnd")
 
+#if defined(_MSC_VER)
+#pragma comment(lib, "user32.lib") // CreateWindowEx GetMessage DispatchMessage RegisterClassEx UnregisterClass DefWindowProc SetWindowLong GetWindowLong
+#endif
+
 namespace itas109
 {
 class CSerialPortHotPlug

diff --git a/include/CSerialPort/iutils.hpp b/include/CSerialPort/iutils.hpp
@@ -18,7 +18,10 @@
 #include <windows.h>        // GetSystemInfo
 #include <tchar.h>          // _T
 
+#if defined(_MSC_VER)
 #pragma comment(lib, "advapi32.lib") // RegQueryValueEx RegCloseKey
+#endif
+
 #elif defined(__linux__)
 #include <unistd.h> // sysconf
 #elif defined(__APPLE__)