Skip to content

Commit a396581

Browse files
committed
Remove linking to jitter lib on all platforms, and old precompiled header on mac
Evades recent weird linking error with MSVC v143 (duplicate symbols between ucrt and jitter)
1 parent a764e48 commit a396581

File tree

1 file changed

+10
-34
lines changed

1 file changed

+10
-34
lines changed

source/script/SetupMaxSDK.cmake

Lines changed: 10 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ endif ()
2525

2626
set(C74_MAX_INCLUDES ${C74_MAX_API_DIR}/max-includes)
2727
set(C74_MSP_INCLUDES ${C74_MAX_API_DIR}/msp-includes)
28-
set(C74_JIT_INCLUDES ${C74_MAX_API_DIR}/jit-includes)
2928

3029
set(FLUID_MAX_SCRIPTS "${CMAKE_CURRENT_LIST_DIR}")
3130

@@ -35,38 +34,26 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_LIBRARY_OUTPUT_DIRECT
3534
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_TEST "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
3635

3736
if (WIN32)
38-
3937
set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tmp")
4038
set(CMAKE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tmp")
39+
set(MaxAPI_LIB ${C74_MAX_INCLUDES}/x64/MaxAPI.lib)
40+
set(MaxAudio_LIB ${C74_MSP_INCLUDES}/x64/MaxAudio.lib)
4141

42-
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
43-
SET(MaxAPI_LIB ${C74_MAX_INCLUDES}/x64/MaxAPI.lib)
44-
SET(MaxAudio_LIB ${C74_MSP_INCLUDES}/x64/MaxAudio.lib)
45-
SET(Jitter_LIB ${C74_JIT_INCLUDES}/x64/jitlib.lib)
46-
else ()
47-
SET(MaxAPI_LIB ${C74_MAX_INCLUDES}/MaxAPI.lib)
48-
SET(MaxAudio_LIB ${C74_MSP_INCLUDES}/MaxAudio.lib)
49-
SET(Jitter_LIB ${C74_JIT_INCLUDES}/jitlib.lib)
50-
endif ()
51-
52-
MARK_AS_ADVANCED (MaxAPI_LIB)
42+
MARK_AS_ADVANCED (MaxAPI_LIB)
5343
MARK_AS_ADVANCED (MaxAudio_LIB)
54-
MARK_AS_ADVANCED (Jitter_LIB)
55-
44+
5645
add_definitions(
5746
-DMAXAPI_USE_MSCRT
5847
-DWIN_VERSION
5948
-D_USE_MATH_DEFINES
6049
)
61-
else ()
50+
endif ()
51+
52+
if (APPLE)
6253
file (STRINGS "${C74_MAX_INCLUDES}/c74_linker_flags.txt" C74_SYM_LINKER_FLAGS)
6354
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${C74_SYM_LINKER_FLAGS}")
6455
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${C74_SYM_LINKER_FLAGS}")
6556
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${C74_SYM_LINKER_FLAGS}")
66-
endif ()
67-
68-
if (APPLE)
69-
find_library(JITTER_LIBRARY "JitterAPI" HINTS "${C74_JIT_INCLUDES}")
7057
find_library(MAX_AUDIO_API "MaxAudioAPI" HINTS "${C74_MSP_INCLUDES}")
7158
endif()
7259

@@ -119,14 +106,13 @@ function(add_max_external)
119106
SYSTEM PRIVATE
120107
"${C74_MAX_INCLUDES}"
121108
"${C74_MSP_INCLUDES}"
122-
"${C74_JIT_INCLUDES}"
123109
)
124110

125111
if(MSVC)
126112
target_compile_options(${safe_name} PRIVATE /external:W0 /W3)
127113
else()
128114
target_compile_options(${safe_name} PRIVATE
129-
-Wall -Wno-gnu-zero-variadic-macro-arguments -Wextra -Wpedantic -Wreturn-type -include "${C74_MAX_INCLUDES}/macho-prefix.pch"
115+
-Wall -Wno-gnu-zero-variadic-macro-arguments -Wextra -Wpedantic -Wreturn-type
130116
)
131117
endif()
132118

@@ -159,26 +145,16 @@ function(add_max_external)
159145
XCODE_GENERATE_SCHEME ON
160146
XCODE_SCHEME_EXECUTABLE "/Applications/Max.app"
161147
)
162-
163-
#If we target < 10.9 we have to manually include this:
164-
target_compile_options(${safe_name} PRIVATE -stdlib=libc++)
165-
148+
166149
target_link_libraries(${safe_name} PRIVATE
167-
${JITTER_LIBRARY}
168150
${MAX_AUDIO_API}
169151
)
170152

171153
elseif (WIN32)
172-
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
173-
set_target_properties(${safe_name} PROPERTIES SUFFIX ".mxe64")
174-
else ()
175-
set_target_properties(${safe_name} PROPERTIES SUFFIX ".mxe")
176-
endif ()
177-
154+
set_target_properties(${safe_name} PROPERTIES SUFFIX ".mxe64")
178155
target_link_libraries(${safe_name} PRIVATE
179156
"${MaxAPI_LIB}"
180157
"${MaxAudio_LIB}"
181-
"${Jitter_LIB}"
182158
)
183159
endif()
184160

0 commit comments

Comments
 (0)