Skip to content

Commit

Permalink
fix: fixed CMakeLists.txt and JLink dynamic lib
Browse files Browse the repository at this point in the history
  • Loading branch information
klonyyy committed Apr 19, 2024
1 parent 0dbda12 commit bec2eb4
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ add_compile_options(-Wall
-Wno-missing-field-initializers)

set(JLINK_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jlink/inc/)
# TODO only temporary
set(JLINK C:/Users/klonyyy/piotrek_moje/programs/SEGGER/OFFICIAL/Windows/x86_64/JLink_x64.dll)

if(UNIX)

Expand Down Expand Up @@ -194,11 +192,11 @@ target_include_directories(${EXECUTABLE} SYSTEM PRIVATE

if(APPLE)
include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${STLINK_INCLUDE_DIRS})
target_link_libraries(${EXECUTABLE} ${STLINK_MACOS} ${LIBUSB_LIBRARY} ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} spdlog::spdlog pthread dl glfw nfd)
target_link_libraries(${EXECUTABLE} ${STLINK_MACOS} ${LIBUSB_LIBRARY} ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} spdlog::spdlog pthread dl glfw nfd)
elseif(UNIX)
target_link_libraries(${EXECUTABLE} ${STLINK_LINUX} ${LIBUSB_LIBRARY} spdlog::spdlog pthread dl GL glfw nfd)
target_link_libraries(${EXECUTABLE} ${STLINK_LINUX} ${LIBUSB_LIBRARY} ${JLINK_LINUX} spdlog::spdlog pthread dl GL glfw nfd)
elseif(WIN32)
target_link_libraries(${EXECUTABLE} ${GLFW3_WINDOWS} ${STLINK_WINDOWS} ${LIBUSB_WINDOWS} ${SPDLOG_WINDOWS} ${JLINK} -static ssp opengl32 nfd -static-libstdc++ -static-libgcc)
target_link_libraries(${EXECUTABLE} ${GLFW3_WINDOWS} ${STLINK_WINDOWS} ${LIBUSB_WINDOWS} ${SPDLOG_WINDOWS} ${JLINK_WINDOWS} -static ssp opengl32 nfd -static-libstdc++ -static-libgcc)
endif()

if(WIN32)
Expand Down

0 comments on commit bec2eb4

Please sign in to comment.