From 84168c9b9da1191bdcea2293a54b36067d990f67 Mon Sep 17 00:00:00 2001
From: Stephen Hurd <deuce@synchro.net>
Date: Tue, 8 Feb 2022 22:49:14 -0500
Subject: [PATCH] Get rid of IMPORTS/EXPORTS and lower-case win32 lib names
---
ciolib/CMakeLists.txt | 3 ---
comio/CMakeLists.txt | 2 --
uifc/CMakeLists.txt | 2 --
xpdev/CMakeLists.txt | 4 +---
4 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/ciolib/CMakeLists.txt b/ciolib/CMakeLists.txt
index 9d0020a..ede224b 100644
--- a/ciolib/CMakeLists.txt
+++ b/ciolib/CMakeLists.txt
@@ -84,9 +84,6 @@ else()
target_compile_definitions(ciolib PRIVATE NO_X)
endif()
-target_compile_definitions(ciolib PRIVATE CIOLIB_EXPORTS)
-target_compile_definitions(ciolib INTERFACE CIOLIB_IMPORTS)
-
if(SDL2_FOUND)
target_include_directories(ciolib PRIVATE ${SDL2_INCLUDE_DIRS})
set(WITH_SDL TRUE PARENT_SCOPE)
diff --git a/comio/CMakeLists.txt b/comio/CMakeLists.txt
index fbc0a78..6dbe774 100644
--- a/comio/CMakeLists.txt
+++ b/comio/CMakeLists.txt
@@ -22,8 +22,6 @@ endif()
add_library(comio OBJECT ${SOURCE})
target_include_directories(comio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_definitions(comio PRIVATE COMIO_EXPORTS)
-target_compile_definitions(comio INTERFACE COMIO_IMPORTS)
target_link_libraries(comio xpdev)
install(
FILES ${HEADER}
diff --git a/uifc/CMakeLists.txt b/uifc/CMakeLists.txt
index 7e118b0..80bda20 100644
--- a/uifc/CMakeLists.txt
+++ b/uifc/CMakeLists.txt
@@ -18,8 +18,6 @@ set(HEADER
add_library(uifc OBJECT ${SOURCE})
target_include_directories(uifc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_compile_definitions(uifc PRIVATE UIFC_EXPORTS)
-target_compile_definitions(uifc INTERFACE UIFC_IMPORTS)
target_link_libraries(uifc ciolib xpdev)
install(
FILES ${HEADER}
diff --git a/xpdev/CMakeLists.txt b/xpdev/CMakeLists.txt
index d7b9b5b..8923a39 100644
--- a/xpdev/CMakeLists.txt
+++ b/xpdev/CMakeLists.txt
@@ -123,11 +123,9 @@ if(HAS_DEV_MACHINE_SPKR_H)
target_compile_definitions(xpdev PRIVATE HAS_DEV_MACHINE_SPKR_H)
endif()
-target_compile_definitions(xpdev PRIVATE WRAPPER_EXPORTS)
-target_compile_definitions(xpdev INTERFACE WRAPPER_IMPORTS)
if(WIN32)
target_compile_definitions(xpdev PUBLIC _WIN32 _WIN32_WINNT=0x0501 WINVER=0x0501 _WIN32_IE=0x0500)
- target_link_libraries(xpdev Iphlpapi Ws2_32 Winmm Netapi32)
+ target_link_libraries(xpdev iphlpapi ws2_32 winmm netapi32)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
target_link_libraries(xpdev network m)
elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
--
GitLab