Fix building on windows

wow2006 · Sep 30, 2020 · 70460ad · 70460ad
1 parent 5a63c4b
commit 70460ad
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 28 deletions.
diff --git a/opengl/CMakeLists.txt b/opengl/CMakeLists.txt
@@ -16,17 +16,36 @@ if(UNIX)
   target_link_libraries(programmablePipelineX11 PRIVATE X11::X11 OpenGL::GL options::options)
 endif()
 
-add_executable(fixedPipelineOpenGLSDL fixedPipelineOpenGLSDL.cpp)
-
-target_link_libraries(fixedPipelineOpenGLSDL PRIVATE OpenGL::GL SDL2::SDL2 options::options)
-
-add_executable(programmablePipelineOpenGLSDL programmablePipelineOpenGLSDL.cpp)
-
-target_link_libraries(programmablePipelineOpenGLSDL PRIVATE OpenGL::GL SDL2::SDL2 options::options)
-
-add_executable(programmablePipelineGl3wSDL programmablePipelineGl3wSDL.cpp)
-
-target_link_libraries(programmablePipelineGl3wSDL PRIVATE OpenGL::GL SDL2::SDL2 options::options gl3w::gl3w)
+set(
+    demos
+    fixedPipelineOpenGLSDL
+    programmablePipelineOpenGLSDL
+    programmablePipelineGl3wSDL
+    programmablePipelineSDL2EGL
+)
+
+foreach(demo IN LISTS demos)
+    add_executable(
+        ${demo}
+        ${demo}.cpp
+    )
+
+    target_link_libraries(
+        ${demo}
+        PRIVATE
+        OpenGL::GL
+        gl3w::gl3w
+        SDL2::SDL2
+        SDL2::SDL2main
+        options::options
+    )
+
+    target_compile_definitions(
+        ${demo}
+        PRIVATE
+        NOMINMAX
+    )
+endforeach()
 
 if(ENABLE_Qt5)
   find_package(Qt5 REQUIRED Widgets)

diff --git a/opengl/programmablePipelineGl3wSDL.cpp b/opengl/programmablePipelineGl3wSDL.cpp
@@ -1,7 +1,6 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
-#define NOMINMAX
 #include <array>
 #include <string>
 #include <cstdlib>

diff --git a/opengl/programmablePipelineSDL2EGL.cpp b/opengl/programmablePipelineSDL2EGL.cpp
@@ -1,11 +1,12 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
-#include <algorithm>
 #include <array>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // SDL
 #include <SDL2/SDL.h>

diff --git a/opengl/shaders/CMakeLists.txt b/opengl/shaders/CMakeLists.txt
@@ -21,8 +21,15 @@ foreach(sample IN LISTS samples)
     PRIVATE
     OpenGL::GL
     SDL2::SDL2
+    SDL2::SDL2main
     options::options
     gl3w::gl3w
   )
+
+  target_compile_definitions(
+    ${sample}
+    PRIVATE
+    NOMINMAX
+  )
 endforeach()
 
diff --git a/opengl/shaders/controlTriangleColorWithMousePosition.cpp b/opengl/shaders/controlTriangleColorWithMousePosition.cpp
@@ -1,11 +1,13 @@
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>

diff --git a/opengl/shaders/drawCube.cpp b/opengl/shaders/drawCube.cpp
@@ -2,10 +2,11 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>

diff --git a/opengl/shaders/drawCubeWithPerspective.cpp b/opengl/shaders/drawCubeWithPerspective.cpp
@@ -2,10 +2,11 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>

diff --git a/opengl/shaders/drawRedPointShader.cpp b/opengl/shaders/drawRedPointShader.cpp
@@ -2,10 +2,11 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>

diff --git a/opengl/shaders/drawRedTriangleShader.cpp b/opengl/shaders/drawRedTriangleShader.cpp
@@ -2,10 +2,11 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>

diff --git a/opengl/shaders/drawTrianglePositionAndColorUsingAttributes.cpp b/opengl/shaders/drawTrianglePositionAndColorUsingAttributes.cpp
@@ -2,10 +2,11 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>

diff --git a/opengl/shaders/drawTriangleUsingAttributes.cpp b/opengl/shaders/drawTriangleUsingAttributes.cpp
@@ -2,10 +2,11 @@
 // PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 // STL
 #include <array>
-#include <algorithm>
-#include <optional>
+#include <string>
 #include <cstdlib>
+#include <optional>
 #include <iostream>
+#include <algorithm>
 #include <string_view>
 // GLM
 #include <glm/vec4.hpp>