Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xpdevplus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Deucе
xpdevplus
Commits
84168c9b
Commit
84168c9b
authored
3 years ago
by
Stephen Hurd
Browse files
Options
Downloads
Patches
Plain Diff
Get rid of IMPORTS/EXPORTS and lower-case win32 lib names
parent
8d1dd910
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ciolib/CMakeLists.txt
+0
-3
0 additions, 3 deletions
ciolib/CMakeLists.txt
comio/CMakeLists.txt
+0
-2
0 additions, 2 deletions
comio/CMakeLists.txt
uifc/CMakeLists.txt
+0
-2
0 additions, 2 deletions
uifc/CMakeLists.txt
xpdev/CMakeLists.txt
+1
-3
1 addition, 3 deletions
xpdev/CMakeLists.txt
with
1 addition
and
10 deletions
ciolib/CMakeLists.txt
+
0
−
3
View file @
84168c9b
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
comio/CMakeLists.txt
+
0
−
2
View file @
84168c9b
...
@@ -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
}
...
...
This diff is collapsed.
Click to expand it.
uifc/CMakeLists.txt
+
0
−
2
View file @
84168c9b
...
@@ -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
}
...
...
This diff is collapsed.
Click to expand it.
xpdev/CMakeLists.txt
+
1
−
3
View file @
84168c9b
...
@@ -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
I
phlpapi
W
s2_32
W
inmm
N
etapi32
)
target_link_libraries
(
xpdev
i
phlpapi
w
s2_32
w
inmm
n
etapi32
)
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"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment