File tree Expand file tree Collapse file tree 1 file changed +18
-0
lines changed Expand file tree Collapse file tree 1 file changed +18
-0
lines changed Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ target_include_directories(gl PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
43
43
# ---------------
44
44
add_executable (sm )
45
45
add_subdirectory (src )
46
+ <<<<<<< HEAD
46
47
47
48
# Math library
48
49
find_library (MATHLIB m )
@@ -63,6 +64,23 @@ target_compile_definitions(sm PRIVATE
63
64
64
65
# Nintendo Switch extra setup
65
66
if (NINTENDO_SWITCH )
67
+ =======
68
+ target_link_libraries (sm PRIVATE SDL2::SDL2 gl )
69
+ set_target_properties (sm PROPERTIES C_STANDARD 11 )
70
+
71
+ if (MSVC )
72
+ target_compile_options (sm PRIVATE ${msvc_warnings} )
73
+ else ()
74
+ target_link_libraries (sm PRIVATE m )
75
+ target_compile_definitions (sm PRIVATE SYSTEM_VOLUME_MIXER_AVAILABLE=0 )
76
+ target_compile_options (sm PRIVATE ${c_warnings} )
77
+ endif ()
78
+
79
+ # Nintendo Switch extra setup
80
+ if (NINTENDO_SWITCH )
81
+ target_compile_definitions (sm PUBLIC __SWITCH__ )
82
+
83
+ >>>>>>> 6d96c49 (Switch build system to CMake )
66
84
# needs to be linked with g++ for C++ stdlib
67
85
enable_language (CXX )
68
86
set_target_properties (sm PROPERTIES
You can’t perform that action at this time.
0 commit comments