immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some minor issues after CR

fix-squashed-planets
MrSimbax 2020-07-14 13:51:07 +02:00
parent 2143f21828
commit df7cdd4b8e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -1,5 +1,4 @@
# Compile flags as defined in global CMakeLists
# Todo: replace with target properties
set(CMAKE_CXX_FLAGS "${COLOBOT_CXX_FLAGS} ${MXE_CFLAGS}")
set(CMAKE_CXX_FLAGS_RELEASE ${COLOBOT_CXX_FLAGS_RELEASE})
set(CMAKE_CXX_FLAGS_DEBUG ${COLOBOT_CXX_FLAGS_DEBUG})
@ -519,7 +518,7 @@ elseif(PLATFORM_WINDOWS)
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
if(BUILD_STATIC)
find_package(Intl REQUIRED)
#todo figure out why those dependencies are needed and find them in a better way
# TODO: figure out why those dependencies are needed and find/link them in a better way
find_library(BZ2_LIBRARY NAMES bz2.lib)
find_library(JPEG_LIBRARY NAMES jpeg.lib)
find_library(TIFF_LIBRARY NAMES tiff.lib)

5
test/cbot/CMakeLists.txt
View File

@ -3,7 +3,10 @@ target_link_directories(CBot_console PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
target_link_libraries(CBot_console PRIVATE CBot colobotbase)
target_link_libraries(CBot_console PRIVATE
CBot
colobotbase # Needed for error strings (TODO: why are they on Colobot side? :/)
)
add_executable(CBot_compile_graph compile_graph.cpp)
target_link_directories(CBot_compile_graph PRIVATE