modifs

bvarillon · Sep 14, 2023 · a5def66 · a5def66
1 parent cf93d5a
commit a5def66
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -23,8 +23,7 @@ jobs:
       #
       # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
-        # os: [ubuntu-latest, windows-latest]
-        os : [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         build_type: [Release]
         c_compiler: [gcc, clang, cl]
         include:

diff --git a/.gitignore b/.gitignore
@@ -36,10 +36,7 @@ build/
 bin/*
 !bin/conf.json
 .vscode/
-<<<<<<< HEAD
 
 Testing/
 neovim.json
-=======
 .cache/
->>>>>>> c96b4bbb92e93d988d3d74323262b9b94318b163
diff --git a/src/main.cpp b/src/main.cpp
@@ -58,6 +58,7 @@ HittableList random_scene(int size)
     world.add(std::make_shared<Sphere>(Point3(4,1,0),1.0, material3));
 
     return world;
+
 }
 
 HittableList fixed_scene(int size)

diff --git a/version.cmake b/version.cmake
@@ -26,7 +26,7 @@ string(STRIP "${GIT_TAG}" GIT_TAG)
 string(STRIP "${GIT_BRANCH}" GIT_BRANCH)
 
 set(VERSION "#define GIT_REV \"${GIT_REV}${GIT_DIFF}\"
-    #define GIT_DESCRIBE \"${GIT_DESCRIBE}${GIT_DIFF}\"
+#define GIT_DESCRIBE \"${GIT_DESCRIBE}${GIT_DIFF}\"
 #define GIT_TAG \"${GIT_TAG}\"
 #define GIT_BRANCH \"${GIT_BRANCH}\"")
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ HittableList random_scene(int size) @@
         world.add(std::make_shared<Sphere>(Point3(4,1,0),1.0, material3));
         return world;
     }
     HittableList fixed_scene(int size)
@@ Expand Down @@