merge: issue/0032 — sql_workbench
# Conflicts: # cpp/apps/primitives_gallery/CMakeLists.txt # cpp/apps/primitives_gallery/demos.h # cpp/apps/primitives_gallery/main.cpp
This commit is contained in:
@@ -15,10 +15,13 @@ add_imgui_app(primitives_gallery
|
||||
${CMAKE_SOURCE_DIR}/functions/core/tween_curves.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/bezier_editor.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/timeline.cpp
|
||||
demos_sql.cpp
|
||||
# text_editor + file_watcher (issue 0025)
|
||||
${CMAKE_SOURCE_DIR}/functions/core/text_editor.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/file_watcher.cpp
|
||||
${CMAKE_SOURCE_DIR}/vendor/imgui_text_edit/TextEditor.cpp
|
||||
# sql_workbench (issue 0032)
|
||||
${CMAKE_SOURCE_DIR}/functions/core/sql_workbench.cpp
|
||||
# Core primitives demoed (tokens vive en fn_framework)
|
||||
${CMAKE_SOURCE_DIR}/functions/core/fullscreen_window.cpp
|
||||
${CMAKE_SOURCE_DIR}/functions/core/page_header.cpp
|
||||
@@ -76,6 +79,10 @@ target_include_directories(primitives_gallery PRIVATE
|
||||
${CMAKE_SOURCE_DIR}/vendor/stb
|
||||
)
|
||||
|
||||
# SQLite (sql_workbench) — alias provisto por cpp/CMakeLists.txt:
|
||||
# system on Linux, vendored amalgamation on Windows cross-compile.
|
||||
target_link_libraries(primitives_gallery PRIVATE SQLite::SQLite3)
|
||||
|
||||
if(WIN32)
|
||||
target_link_libraries(primitives_gallery PRIVATE opengl32)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user