mirror of https://github.com/OpenRCT2/OpenRCT2.git
Declare link directories prior to using them
As it turns out, you have to declare your link directories before you use them in cmake, otherwise your executables/binaries will have no knowledge of them. This should fix travis builds for mingw.
This commit is contained in:
parent
4ce0e3a8b2
commit
b64d4225be
|
@ -62,6 +62,9 @@ if (UNIX)
|
|||
INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
|
||||
endif (UNIX)
|
||||
|
||||
INCLUDE_DIRECTORIES(${ORCTLIBS_INCLUDE} ${JANSSON_INCLUDE})
|
||||
LINK_DIRECTORIES(${LINK_DIRECTORIES} ${LIB32} ${SDL2_LIBRARY_DIRS} ${ORCTLIBS_LIB_DIR})
|
||||
|
||||
if (WIN32)
|
||||
# build as library for now, replace with add_executable
|
||||
add_library(${PROJECT} SHARED ${ORCT2_SOURCES})
|
||||
|
@ -69,9 +72,6 @@ else (WIN32)
|
|||
add_executable(${PROJECT} ${ORCT2_SOURCES})
|
||||
endif (WIN32)
|
||||
|
||||
INCLUDE_DIRECTORIES(${ORCTLIBS_INCLUDE} ${JANSSON_INCLUDE})
|
||||
LINK_DIRECTORIES(${LINK_DIRECTORIES} ${LIB32} ${SDL2_LIBRARY_DIRS} ${ORCTLIBS_LIB_DIR})
|
||||
|
||||
# install into ${CMAKE_INSTALL_PREFIX}/bin/
|
||||
#install (TARGETS ${PROJECT} DESTINATION bin)
|
||||
|
||||
|
|
Loading…
Reference in New Issue