Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PoroCYon
Bonzomatic
Commits
b1825640
Commit
b1825640
authored
Oct 09, 2018
by
Gargaj
Browse files
lessons in why i hate git, chapter 471389
parent
c8564206
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b1825640
...
...
@@ -478,16 +478,7 @@ endif ()
target_include_directories
(
${
BZC_EXE_NAME
}
PUBLIC
${
BZC_PROJECT_INCLUDES
}
)
target_link_libraries
(
${
BZC_EXE_NAME
}
${
BZC_PROJECT_LIBS
}
)
<<<<<<< HEAD
if
(
WIN32
)
if
(
BONZOMATIC_64BIT
)
add_custom_command
(
TARGET
${
BZC_EXE_NAME
}
POST_BUILD COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
"
${
CMAKE_SOURCE_DIR
}
/external/bass/x64/bass.dll"
$<TARGET_FILE_DIR:
${
BZC_EXE_NAME
}
>
)
else
()
add_custom_command
(
TARGET
${
BZC_EXE_NAME
}
POST_BUILD COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
"
${
CMAKE_SOURCE_DIR
}
/external/bass/x86/bass.dll"
$<TARGET_FILE_DIR:
${
BZC_EXE_NAME
}
>
)
endif
()
=======
if
(
MSVC
)
>>>>>>> remove dependency to bass, use mini_al instead
if
(
BONZOMATIC_NDI
)
if
(
BONZOMATIC_64BIT
)
add_custom_command
(
TARGET
${
BZC_EXE_NAME
}
POST_BUILD COMMAND
${
CMAKE_COMMAND
}
-E copy_if_different
"
${
NDI_SDK_DIR
}
/Bin/x64/Processing.NDI.Lib.x64.dll"
$<TARGET_FILE_DIR:
${
BZC_EXE_NAME
}
>
)
...
...
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