diff options
author | sotech117 <michael_foiani@brown.edu> | 2024-05-09 20:21:38 -0400 |
---|---|---|
committer | sotech117 <michael_foiani@brown.edu> | 2024-05-09 20:21:38 -0400 |
commit | ac3f1e423e696392ea0a50c2652b829e5c5734b6 (patch) | |
tree | b6ecb80019dae822619079ce34336d34a033f2df /CMakeLists.txt | |
parent | f846ddba00aee29675f0bd4f5dbc87a94a422368 (diff) | |
parent | 14684344d553dee4b3cc252709716bff927e85b8 (diff) |
resolve merge conflicts and attempt to fix local paths
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e4a04c..402d6ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,10 +117,14 @@ qt6_add_resources(${PROJECT_NAME} "Resources" resources/shaders/skybox.frag resources/shaders/skybox.vert - - - - + resources/images/cupertin-lake_rt.png + resources/images/cupertin-lake_lf.png + resources/images/cupertin-lake_up.png + resources/images/cupertin-lake_dn.png + resources/images/cupertin-lake_bk.png + resources/images/cupertin-lake_ft.png + resources/images/halftone.png + resources/images/foam3.png ) |