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 /cmake-build-debug/ocean_autogen/deps | |
| parent | f846ddba00aee29675f0bd4f5dbc87a94a422368 (diff) | |
| parent | 14684344d553dee4b3cc252709716bff927e85b8 (diff) | |
resolve merge conflicts and attempt to fix local paths
Diffstat (limited to 'cmake-build-debug/ocean_autogen/deps')
| -rw-r--r-- | cmake-build-debug/ocean_autogen/deps | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake-build-debug/ocean_autogen/deps b/cmake-build-debug/ocean_autogen/deps index a22dbe3..e18b0d5 100644 --- a/cmake-build-debug/ocean_autogen/deps +++ b/cmake-build-debug/ocean_autogen/deps @@ -1079,10 +1079,14 @@ ocean_autogen/timestamp: \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/main.cpp \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.cpp \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/mainwindow.h \ + /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/halftone.cpp \ + /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/halftone.h \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.cpp \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean.h \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.cpp \ /Users/sotech117/Documents/final/adv/ocean-simulation/src/ocean/ocean_alt.h \ + /Users/sotech117/Documents/final/adv/ocean-simulation/src/skybox.cpp \ + /Users/sotech117/Documents/final/adv/ocean-simulation/src/skybox.h \ /Users/sotech117/Documents/final/adv/ocean-simulation/util/tiny_obj_loader.h \ /Users/sotech117/Documents/final/adv/ocean-simulation/util/unsupportedeigenthing/OpenGLSupport \ /Users/sotech117/Library/Application\ Support/JetBrains/Toolbox/apps/CLion/ch-0/232.9921.42/CLion.app/Contents/bin/cmake/mac/share/cmake-3.26/Modules/CMakeCInformation.cmake \ |