Reenable all targets

Deamon87 · Oct 8, 2022 · 6ccbd9b · 6ccbd9b
1 parent e516883
commit 6ccbd9b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 46 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,18 +29,18 @@ jobs:
       fail-fast: false
       matrix:
         config:
-#          - {
-#            name: "Windows Latest MSVC",
-#            os: windows-latest,
-#            artifact: "windows_msvc.7z",
-#            build_type: "Release",
-#            cmake_defines: "",
-#            cc: "cl",
-#            cxx: "cl",
-#            environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
-#            archiver: "7z a",
-#            generators: "Visual Studio 17 2022"
-#          }
+          - {
+            name: "Windows Latest MSVC",
+            os: windows-latest,
+            artifact: "windows_msvc.7z",
+            build_type: "Release",
+            cmake_defines: "",
+            cc: "cl",
+            cxx: "cl",
+            environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
+            archiver: "7z a",
+            generators: "Visual Studio 17 2022"
+          }
           #        - {
           #            name: "Windows Latest MinGW",
           #            os: windows-latest,
@@ -52,17 +52,17 @@ jobs:
           #            archiver: "7z a",
           #            generators: "Ninja"
           #          }
-#          - {
-#            name: "Ubuntu_Latest_GCC",
-#            os: ubuntu-latest,
-#            artifact: "ubuntu_gcc.7z",
-#            build_type: "Release",
-#            cmake_defines: "",
-#            cc: "gcc",
-#            cxx: "g++",
-#            archiver: "7z a",
-#            generators: "Ninja"
-#          }
+          - {
+            name: "Ubuntu_Latest_GCC",
+            os: ubuntu-latest,
+            artifact: "ubuntu_gcc.7z",
+            build_type: "Release",
+            cmake_defines: "",
+            cc: "gcc",
+            cxx: "g++",
+            archiver: "7z a",
+            generators: "Ninja"
+          }
           - {
             name: "Emscripten",
             os: ubuntu-latest,
@@ -74,28 +74,17 @@ jobs:
             archiver: "7z a",
             generators: "Ninja"
           }
-#          - {
-#            name: "Ubuntu_GCC_9",
-#            os: ubuntu-latest,
-#            artifact: "ubuntu_gcc9.7z",
-#            build_type: "Release",
-#            cmake_defines: "",
-#            cc: "gcc",
-#            cxx: "g++",
-#            archiver: "7z a",
-#            generators: "Ninja"
-#          }
-#          - {
-#            name: "macOS Latest Clang",
-#            os: macos-latest,
-#            artifact: "macos_clang.7z",
-#            build_type: "Release",
-#            cmake_defines: "-DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\"",
-#            cc: "clang",
-#            cxx: "clang++",
-#            archiver: "7za a",
-#            generators: "Ninja"
-#          }
+          - {
+            name: "macOS Latest Clang",
+            os: macos-latest,
+            artifact: "macos_clang.7z",
+            build_type: "Release",
+            cmake_defines: "-DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\"",
+            cc: "clang",
+            cxx: "clang++",
+            archiver: "7za a",
+            generators: "Ninja"
+          }
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

diff --git a/emscripten_port/CMakeLists.txt b/emscripten_port/CMakeLists.txt
@@ -18,7 +18,8 @@ message( EMSCRIPTEN_ROOT_PATH = ${EMSCRIPTEN_ROOT_PATH})
 option(COMPILE_WITH_SIMD "Compile with experimental WASM SIMD support" OFF)
 message(COMPILE_WITH_SIMD = ${COMPILE_WITH_SIMD})
 
-set(ADDITIONAL_COMPILATION_FLAGS "-gsource-map --emit-symbol-map")
+set(ADDITIONAL_COMPILATION_FLAGS "--emit-symbol-map")
+#set(ADDITIONAL_COMPILATION_FLAGS "${ADDITIONAL_COMPILATION_FLAGS} -gsource-map ")
 
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${ADDITIONAL_COMPILATION_FLAGS}" )
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${ADDITIONAL_COMPILATION_FLAGS}" )