Merge pull request #15 from BreeDurbin/ui-files-4

got assets working in a library
BreeDurbin · Apr 18, 2024 · 196aa84 · 196aa84
2 parents 7f4c3f7 + 909b4c1
commit 196aa84
Show file tree

Hide file tree

Showing 22 changed files with 646 additions and 317 deletions.
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -11,6 +11,7 @@ set(HEADER_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage/CombatPage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage/CreaturePage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage/WorldPage.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/HistoryPage/HistoryPage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage/CampaignPage.h
     ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage/SettingsPage.h
 )
@@ -20,6 +21,7 @@ set(SOURCE_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage/CombatPage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage/CreaturePage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage/WorldPage.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/HistoryPage/HistoryPage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage/CampaignPage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage/SettingsPage.cpp
 )
@@ -29,15 +31,19 @@ set(UI_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage/CombatPage.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage/CreaturePage.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage/WorldPage.ui
+    ${CMAKE_CURRENT_SOURCE_DIR}/HistoryPage/HistoryPage.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage/CampaignPage.ui
     ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage/SettingsPage.ui
 )
 
 set(RESOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/asset/graphics.qrc
-    ${CMAKE_CURRENT_SOURCE_DIR}/asset/resources.qrc
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset/icon.qrc
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset/image.qrc
 )
 
+qt_add_resources (RCC_SOURCES ${RESOURCE_FILES})
+
+
 add_library(
     qtLib
     STATIC
@@ -48,7 +54,7 @@ add_library(
     #sources
     ${SOURCE_FILES}
     #resources
-    ${RESOURCE_FILES}
+    ${RCC_SOURCES}
 )
 
 target_link_libraries(
@@ -65,10 +71,14 @@ target_include_directories(
     qtLib
     PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/CyrusDialog
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset/icon
+    ${CMAKE_CURRENT_SOURCE_DIR}/asset/image
     INTERFACE
     ${CMAKE_CURRENT_SOURCE_DIR}/CampaignPage
     ${CMAKE_CURRENT_SOURCE_DIR}/CombatPage
     ${CMAKE_CURRENT_SOURCE_DIR}/CreaturePage
     ${CMAKE_CURRENT_SOURCE_DIR}/SettingsPage
     ${CMAKE_CURRENT_SOURCE_DIR}/WorldPage
+    ${CMAKE_CURRENT_SOURCE_DIR}/HistoryPage
 )