Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Dependencies
Cpp
mirrage
Commits
fe79d1a3
Commit
fe79d1a3
authored
Feb 22, 2019
by
Florian Oetke
Browse files
Merge branch 'feature/windows_and_msvc_support' into 'develop'
Feature/windows and msvc support See merge request lowkey42/mirrage!12
parents
57d23603
75377eab
Pipeline
#2613
passed with stage
in 13 minutes and 29 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
dependencies/CMakeLists.txt
View file @
fe79d1a3
...
...
@@ -60,6 +60,10 @@ endif()
if
(
NOT TARGET mirrage::deps::SDL2
)
message
(
"Building SDL2 from source"
)
add_subdirectory
(
SDL
)
if
(
MSVC
)
target_compile_options
(
SDL2 PRIVATE /wd4267 /wd4018
)
target_compile_options
(
SDL2-static PRIVATE /wd4267 /wd4018
)
endif
()
add_library
(
mirrage::deps::SDL2 ALIAS SDL2-static
)
add_library
(
mirrage::deps::SDL2main ALIAS SDL2main
)
endif
()
...
...
dependencies/enet/CMakeLists.txt
View file @
fe79d1a3
...
...
@@ -72,7 +72,11 @@ target_include_directories(enet PUBLIC
$<INSTALL_INTERFACE:include>
)
if
(
WIN32
)
target_link_libraries
(
enet winmm ws2_32
)
target_link_libraries
(
enet PUBLIC winmm ws2_32
)
endif
()
if
(
MSVC
)
target_compile_definitions
(
enet PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS
)
endif
()
install
(
TARGETS enet EXPORT enetTargets
...
...
globals.cmake
View file @
fe79d1a3
...
...
@@ -55,7 +55,9 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-Wno-missing-braces
)
elseif
(
MSVC
)
set
(
MIRRAGE_DEFAULT_COMPILER_ARGS /DWIN32_LEAN_AND_MEAN /DNOMINMAX /MP
)
set
(
MIRRAGE_DEFAULT_COMPILER_ARGS /DWIN32_LEAN_AND_MEAN /DNOMINMAX /MP /W3 /WX
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
/ignore:4221"
)
set
(
CMAKE_STATIC_LINKER_FLAGS
"
${
CMAKE_STATIC_LINKER_FLAGS
}
/ignore:4221"
)
endif
()
# Select optimal linker
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment