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/.ninja_log | |
| parent | f846ddba00aee29675f0bd4f5dbc87a94a422368 (diff) | |
| parent | 14684344d553dee4b3cc252709716bff927e85b8 (diff) | |
resolve merge conflicts and attempt to fix local paths
Diffstat (limited to 'cmake-build-debug/.ninja_log')
| -rw-r--r-- | cmake-build-debug/.ninja_log | 145 |
1 files changed, 61 insertions, 84 deletions
diff --git a/cmake-build-debug/.ninja_log b/cmake-build-debug/.ninja_log index 051ba0e..bd31acf 100644 --- a/cmake-build-debug/.ninja_log +++ b/cmake-build-debug/.ninja_log @@ -1,88 +1,65 @@ # ninja log v5 -12 41 1714798632131430431 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 -1645 4059 1714849325058746610 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +13 38 1715274665230530986 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 +1512 4844 1715297344718772169 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 78 110 1712645727876186134 CMakeFiles/StaticGLEW.dir/StaticGLEW_autogen/mocs_compilation.cpp.o cf14dd1335b34a8d -5173 6594 1714798638674541274 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 -1647 4944 1714849325940198995 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 -4944 5062 1714849326069646592 ocean 90ea6245b9d0c531 -1645 4083 1714849325084208159 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1646 4515 1714849325508570672 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -3358 3439 1714798635528627000 libStaticGLEW.a 8b4a852037c57830 -5173 5621 1714798637703869673 CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o bf7241321ed3a409 -12 41 1714798632131430431 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 -12 41 1714798632131430431 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +1521 4165 1715297344049177658 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 +4734 7910 1715274673090001677 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 +1741 1862 1715297428643492070 ocean 90ea6245b9d0c531 +1515 4798 1715297344682105484 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +1520 5532 1715297345415079003 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +439 519 1715274665712161000 libStaticGLEW.a 8b4a852037c57830 +2043 2947 1715274668133653802 CMakeFiles/ocean.dir/src/graphics/graphicsdebug.cpp.o bf7241321ed3a409 +13 38 1715274665230530986 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +13 38 1715274665230530986 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 1904 5414 1712645733171665244 CMakeFiles/ocean.dir/src/graphics/meshloader.cpp.o 64961778db90f56 -12 41 1714798632131430431 StaticGLEW_autogen/timestamp dc143b4497306125 -1 208 1714786291867142933 build.ninja dbd6bd50c232cbc4 -13 1443 1714849322439247000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1444 1644 1714849322652629849 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b -42 3358 1714798635444441414 CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o 4784775df883673d -13 1443 1714849322439247000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +13 38 1715274665230530986 StaticGLEW_autogen/timestamp dc143b4497306125 +0 312 1715299334699502267 build.ninja dbd6bd50c232cbc4 +13 50 1715297426833568293 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1848 2039 1715274667230803612 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b +39 439 1715274665627645867 CMakeFiles/StaticGLEW.dir/glew/src/glew.c.o 4784775df883673d +13 50 1715297426833568293 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 1899 4665 1712645732404853458 CMakeFiles/ocean.dir/src/graphics/camera.cpp.o d624ce2b01ab1415 -13 1443 1714849322439247000 ocean_autogen/timestamp 43dd0284b7c480b9 -13 1443 1714849322439247000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1644 3711 1714849324706874005 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -5173 6446 1714798638528665913 CMakeFiles/ocean.dir/src/graphics/shader.cpp.o 267b6ae673a33204 -1646 3824 1714849324823821994 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b -1444 1644 1714849322652629849 .rcc/qrc_Resources.cpp e023bb8377457e1b -5622 6431 1714798638512399688 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba -1647 2974 1714849323972820909 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a -12 1343 1714849489919521000 ocean_autogen/timestamp 43dd0284b7c480b9 -12 1343 1714849489919521000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 1343 1714849489919521000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 1343 1714849489919521000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1343 3058 1714849491634745870 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -1344 3066 1714849491644097365 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1343 3071 1714849491648431194 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -12 54 1714849512803933609 ocean_autogen/timestamp 43dd0284b7c480b9 -12 54 1714849512803933609 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 54 1714849512803933609 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 54 1714849512803933609 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -59 2256 1714849514995444844 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -2256 2378 1714849515124708731 ocean 90ea6245b9d0c531 -12 48 1714849546910108212 ocean_autogen/timestamp 43dd0284b7c480b9 -12 48 1714849546910108212 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 48 1714849546910108212 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 48 1714849546910108212 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 903 1714849585867613000 ocean_autogen/timestamp 43dd0284b7c480b9 -12 903 1714849585867613000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 903 1714849585867613000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 903 1714849585867613000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -13 1371 1714849679964127000 ocean_autogen/timestamp 43dd0284b7c480b9 -13 1371 1714849679964127000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -13 1371 1714849679964127000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -13 1371 1714849679964127000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 1419 1714849740909476000 ocean_autogen/timestamp 43dd0284b7c480b9 -12 1419 1714849740909476000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 1419 1714849740909476000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 1419 1714849740909476000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1420 3366 1714849742859070429 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -1419 3374 1714849742869732936 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -1419 3406 1714849742902087877 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -1421 3822 1714849743317925525 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -3822 3938 1714849743440390980 ocean 90ea6245b9d0c531 -13 50 1714849812101018777 ocean_autogen/timestamp 43dd0284b7c480b9 -13 50 1714849812101018777 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -13 50 1714849812101018777 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -13 50 1714849812101018777 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -55 2158 1714849814198824051 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -2159 2268 1714849814316943052 ocean 90ea6245b9d0c531 -12 47 1714849854255275738 ocean_autogen/timestamp 43dd0284b7c480b9 -12 47 1714849854255275738 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 47 1714849854255275738 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 47 1714849854255275738 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -52 2271 1714849856467743692 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -2271 2381 1714849856586742326 ocean 90ea6245b9d0c531 -12 1395 1714850004866419000 ocean_autogen/timestamp 43dd0284b7c480b9 -12 1395 1714850004866419000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 1395 1714850004866419000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 1395 1714850004866419000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -1395 3342 1714850006815112363 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 -1395 3348 1714850006819452984 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 -1396 3357 1714850006832743054 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd -12 49 1714850057707318528 ocean_autogen/timestamp 43dd0284b7c480b9 -12 49 1714850057707318528 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -12 49 1714850057707318528 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 -12 49 1714850057707318528 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 -53 2317 1714850059965615495 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 -2317 2433 1714850060089833714 ocean 90ea6245b9d0c531 +13 50 1715297426833568293 ocean_autogen/timestamp 43dd0284b7c480b9 +1511 4736 1715297344619832271 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +2046 4734 1715274669919280047 CMakeFiles/ocean.dir/src/graphics/shader.cpp.o 267b6ae673a33204 +13 50 1715297426833568293 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +54 1741 1715297428517242555 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1521 3259 1715297343146557713 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +1848 2039 1715274667230803612 .rcc/qrc_Resources.cpp e023bb8377457e1b +2947 4344 1715274669529296463 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +0 202 1715299334699502267 build.ninja dbd6bd50c232cbc4 +16 41 1715299334767160542 StaticGLEW_autogen/timestamp dc143b4497306125 +16 41 1715299334767160542 StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +16 41 1715299334767160542 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/timestamp dc143b4497306125 +16 41 1715299334767160542 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/StaticGLEW_autogen/mocs_compilation.cpp dc143b4497306125 +42 1503 1715299336190038000 ocean_autogen/timestamp 43dd0284b7c480b9 +42 1503 1715299336190038000 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +42 1503 1715299336190038000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +42 1503 1715299336190038000 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +1504 2098 1715299336821491711 .rcc/qrc_Resources.cpp e023bb8377457e1b +1504 2098 1715299336821491711 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/.rcc/qrc_Resources.cpp e023bb8377457e1b +2111 3635 1715299338351273532 CMakeFiles/ocean.dir/src/ocean/ocean.cpp.o 960e422714c6a8ba +2109 4451 1715299339164062954 CMakeFiles/ocean.dir/src/graphics/shader.cpp.o 267b6ae673a33204 +4451 4739 1715299339459105768 CMakeFiles/ocean.dir/src/ocean/halftone.cpp.o 8d9394826e07b034 +2109 4740 1715299339455807689 CMakeFiles/ocean.dir/src/graphics/shape.cpp.o fad1395b11fceaa7 +2100 5069 1715299339783217955 CMakeFiles/ocean.dir/src/main.cpp.o 11d1d3bb5133c4bd +2098 5083 1715299339796086686 CMakeFiles/ocean.dir/ocean_autogen/mocs_compilation.cpp.o a0b6000c88b7e2e0 +2102 5230 1715299339942367011 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +2100 5231 1715299339945623548 CMakeFiles/ocean.dir/src/mainwindow.cpp.o b8eab0029b0c2d42 +3635 5248 1715299339962106274 CMakeFiles/ocean.dir/src/ocean/ocean_alt.cpp.o ad7112753002ff6a +2108 6174 1715299340885755991 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +4739 6955 1715299341667690334 CMakeFiles/ocean.dir/src/skybox.cpp.o 8709c3292b10899e +4740 11934 1715299346643530390 CMakeFiles/ocean.dir/cmake-build-debug/.rcc/qrc_Resources.cpp.o 5414beaf8d128308 +11935 12104 1715299346825220163 ocean c2cf90dc856044f7 +11 46 1715299397167741527 ocean_autogen/timestamp 43dd0284b7c480b9 +11 46 1715299397167741527 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +11 46 1715299397167741527 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +11 46 1715299397167741527 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +50 1893 1715299399006050516 CMakeFiles/ocean.dir/src/arap.cpp.o 46f485071c8cb61b +1893 2017 1715299399135323075 ocean c2cf90dc856044f7 +13 50 1715299482878485573 ocean_autogen/timestamp 43dd0284b7c480b9 +13 50 1715299482878485573 ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +13 50 1715299482878485573 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/timestamp 43dd0284b7c480b9 +13 50 1715299482878485573 /Users/sotech117/Documents/final/adv/ocean-simulation/cmake-build-debug/ocean_autogen/mocs_compilation.cpp 43dd0284b7c480b9 +54 2364 1715299485182775081 CMakeFiles/ocean.dir/src/glwidget.cpp.o b59369eca2fe4e32 +2365 2480 1715299485305538441 ocean c2cf90dc856044f7 |