Merge pull request #121 from GrafVonTee/develop

Develop
GrafVonTee · Jun 21, 2023 · ad54fe2 · ad54fe2
2 parents 72aa84a + 4952cf4
commit ad54fe2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -4,10 +4,10 @@ name: CI
 on: 
   push:
     branches:
-      - main
+      - develop
   pull_request:
     branches:
-      - main
+      - develop
 
 jobs:
   build:

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,9 @@
 /build
 /.vscode
 
+# github settings
+./github
+
 # Prerequisites
 *.d
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,12 @@
 cmake_minimum_required(VERSION 3.16)
-project(triangle_intersections CXX C)
+project(Interpol CXX C)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_C_STANDARD 99)
 
-if(UNIX AND NOT APPLE)
+if(WIN32)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+elseif(UNIX AND NOT APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
 endif()
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,10 +4,10 @@ name: CI @@
     on:
       push:
         branches:
-          - main
+          - develop
       pull_request:
         branches:
-          - main
+          - develop
     jobs:
       build:
@@ Expand Down @@