Skip to content
Snippets Groups Projects
Commit 84168c9b authored by Stephen Hurd's avatar Stephen Hurd
Browse files

Get rid of IMPORTS/EXPORTS and lower-case win32 lib names

parent 8d1dd910
Branches
No related tags found
No related merge requests found
...@@ -84,9 +84,6 @@ else() ...@@ -84,9 +84,6 @@ else()
target_compile_definitions(ciolib PRIVATE NO_X) target_compile_definitions(ciolib PRIVATE NO_X)
endif() endif()
target_compile_definitions(ciolib PRIVATE CIOLIB_EXPORTS)
target_compile_definitions(ciolib INTERFACE CIOLIB_IMPORTS)
if(SDL2_FOUND) if(SDL2_FOUND)
target_include_directories(ciolib PRIVATE ${SDL2_INCLUDE_DIRS}) target_include_directories(ciolib PRIVATE ${SDL2_INCLUDE_DIRS})
set(WITH_SDL TRUE PARENT_SCOPE) set(WITH_SDL TRUE PARENT_SCOPE)
......
...@@ -22,8 +22,6 @@ endif() ...@@ -22,8 +22,6 @@ endif()
add_library(comio OBJECT ${SOURCE}) add_library(comio OBJECT ${SOURCE})
target_include_directories(comio PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) 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) target_link_libraries(comio xpdev)
install( install(
FILES ${HEADER} FILES ${HEADER}
......
...@@ -18,8 +18,6 @@ set(HEADER ...@@ -18,8 +18,6 @@ set(HEADER
add_library(uifc OBJECT ${SOURCE}) add_library(uifc OBJECT ${SOURCE})
target_include_directories(uifc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) 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) target_link_libraries(uifc ciolib xpdev)
install( install(
FILES ${HEADER} FILES ${HEADER}
......
...@@ -123,11 +123,9 @@ if(HAS_DEV_MACHINE_SPKR_H) ...@@ -123,11 +123,9 @@ if(HAS_DEV_MACHINE_SPKR_H)
target_compile_definitions(xpdev PRIVATE HAS_DEV_MACHINE_SPKR_H) target_compile_definitions(xpdev PRIVATE HAS_DEV_MACHINE_SPKR_H)
endif() endif()
target_compile_definitions(xpdev PRIVATE WRAPPER_EXPORTS)
target_compile_definitions(xpdev INTERFACE WRAPPER_IMPORTS)
if(WIN32) if(WIN32)
target_compile_definitions(xpdev PUBLIC _WIN32 _WIN32_WINNT=0x0501 WINVER=0x0501 _WIN32_IE=0x0500) 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") elseif(CMAKE_SYSTEM_NAME STREQUAL "Haiku")
target_link_libraries(xpdev network m) target_link_libraries(xpdev network m)
elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD") elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment