Update vscode & CMake related points

MaJerle · May 18, 2022 · 9f811e4 · 9f811e4
1 parent 682a0fb
commit 9f811e4
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 12 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -1,4 +1,5 @@
 {
+    "version": 4,
     "configurations": [
         {
             "name": "Win32",
@@ -8,6 +9,5 @@
             "intelliSenseMode": "windows-gcc-x86",
             "configurationProvider": "ms-vscode.cmake-tools"
         }
-    ],
-    "version": 4
+    ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,13 +8,12 @@
             "name": "(Windows) Launch",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}\\build\\LwLibPROJECT.exe",
+            "program": "${command:cmake.buildDirectory}\\LwLibPROJECT.exe",
             "miDebuggerPath": "c:\\msys64\\mingw64\\bin\\gdb.exe",
             "args": [],
             "stopAtEntry": false,
             "cwd": "${fileDirname}",
-            "environment": [],
-            "console": "integratedTerminal"
+            "environment": []
         }
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,10 @@
 {
     "files.associations": {
-        "lwow.h": "c",
-        "lwow_sys.h": "c"
-    }
+        "lwevt_types.h": "c",
+        "lwevt_type.h": "c",
+        "lwevt.h": "c",
+        "string.h": "c",
+        "lwevt_opt.h": "c"
+    },
+    "esbonio.sphinx.confDir": ""
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -5,7 +5,7 @@
             "type": "cppbuild",
             "label": "Build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -19,7 +19,7 @@
             "type": "shell",
             "label": "Re-build project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--clean-first", "-v", "-j", "8"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--clean-first", "-v", "-j", "8"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -29,7 +29,7 @@
             "type": "shell",
             "label": "Clean project",
             "command": "cmake",
-            "args": ["--build", "\"build\"", "--target", "clean"],
+            "args": ["--build", "${command:cmake.buildDirectory}", "--target", "clean"],
             "options": {
                 "cwd": "${workspaceFolder}"
             },
@@ -38,7 +38,7 @@
         {
             "type": "shell",
             "label": "Run application",
-            "command": "${workspaceFolder}\\build\\LwLibPROJECT.exe",
+            "command": "${command:cmake.buildDirectory}\\LwLibPROJECT.exe",
             "args": [],
             "problemMatcher": [],
         },

diff --git a/cmake/i686-w64-mingw32-gcc.cmake b/cmake/i686-w64-mingw32-gcc.cmake
@@ -0,0 +1,7 @@
+set(CMAKE_SYSTEM_NAME               Windows)
+
+# Some default GCC settings
+set(CMAKE_C_COMPILER                i686-w64-mingw32-gcc)
+set(CMAKE_CXX_COMPILER              i686-w64-mingw32-g++)
+
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
diff --git a/cmake/x86_64-w64-mingw32-gcc.cmake b/cmake/x86_64-w64-mingw32-gcc.cmake
@@ -0,0 +1,7 @@
+set(CMAKE_SYSTEM_NAME               Windows)
+
+# Some default GCC settings
+set(CMAKE_C_COMPILER                x86_64-w64-mingw32-gcc)
+set(CMAKE_CXX_COMPILER              x86_64-w64-mingw32-g++)
+
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)