Update CMakeLists and #defines to support MSYS2/GCC

OpenEtherCATsociety · Nov 27, 2024 · 3dfce15 · 3dfce15
1 parent 83c6264
commit 3dfce15
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 555 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,8 +28,14 @@ if(WIN32)
   elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
     link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib)
   endif()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
+  if(MSVC)  
+    message(STATUS "Win32 MSVC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  /WX")
+  else()
+    message(STATUS "Win32 non-MSVC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
+  endif()
   set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib)
 elseif(UNIX AND NOT APPLE)
   set(OS "linux")

diff --git a/osal/win32/inttypes.h b/osal/win32/inttypes.h
diff --git a/osal/win32/osal_defs.h b/osal/win32/osal_defs.h
@@ -21,11 +21,17 @@ extern "C"
 #endif
 
 #ifndef PACKED
-#define PACKED_BEGIN __pragma(pack(push, 1))
 #define PACKED
+#ifdef __GNUC__
+#define PACKED_BEGIN 
+#define PACKED_END
+#else
+#define PACKED_BEGIN __pragma(pack(push, 1))
 #define PACKED_END __pragma(pack(pop))
 #endif
 
+#endif
+
 #define OSAL_THREAD_HANDLE HANDLE
 #define OSAL_THREAD_FUNC void
 #define OSAL_THREAD_FUNC_RT void