[merge] fix

onon1101 · Mar 22, 2024 · 83bc8c2 · 83bc8c2
1 parent 7d134c9
commit 83bc8c2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/multi_system.yml b/.github/workflows/multi_system.yml
@@ -7,40 +7,40 @@ on:
 
 jobs:
 
-  windows-visual-studio:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
+  # windows-visual-studio:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
 
-      - name: "Setup Visual Studio"
-        uses: egor-tensin/vs-shell@v2
+  #     - name: "Setup Visual Studio"
+  #       uses: egor-tensin/vs-shell@v2
 
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
+  #     - name: Checkout Repository
+  #       uses: actions/checkout@v3
+  #       with:
+  #         submodules: recursive
 
-      - name: "Setup cmake"
-        run: |
-          cmake -B build -DCMAKE_BUILD_TYPE=Debug
-          cmake --build build
+  #     - name: "Setup cmake"
+  #       run: |
+  #         cmake -B build -DCMAKE_BUILD_TYPE=Debug
+  #         cmake --build build
 
-  windows-mingw:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: seanmiddleditch/gha-setup-ninja@master
-
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
+  # windows-mingw:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: seanmiddleditch/gha-setup-ninja@master
+
+  #     - name: Checkout Repository
+  #       uses: actions/checkout@v3
+  #       with:
+  #         submodules: recursive
 
-      - name: "Build"
-        run: |
-          cmake -B build -DCMAKE_BUILD_TYPE=Debug -G "MinGW Makefiles"
-          # cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Debug
-          cmake --build build
+  #     - name: "Build"
+  #       run: |
+  #         cmake -B build -DCMAKE_BUILD_TYPE=Debug -G "MinGW Makefiles"
+  #         # cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Debug
+  #         cmake --build build
   macos:
     runs-on: macos-latest
     steps:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 #add_subdirectory(${CMAKE_BINARY_DIR}/_deps/ptsd-src/)
 # add_library(Framework ${PTSD_SRC_FILES} $<TARGET_OBJECTS:PracticalToolsForSimpleDesign>)
-add_library(Framework ${PTSD_SRC_FILES} $<TARGET_OBJECTS:PracticalToolsForSimpleDesign>)
+add_library(Framework ${PTSD_SRC_FILES} $<TARGET_OBJECTS:PTSD>)
 
 set(SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 set(INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)