Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions libs/openFrameworksCompiled/project/msys2/config.msys2.default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,22 @@ PLATFORM_CXXFLAGS += -std=gnu++17
PLATFORM_CFLAGS += -DUNICODE -D_UNICODE
#PLATFORM_CFLAGS += -IC:/msys64/mingw32/include/gstreamer-1.0 -DOF_VIDEO_PLAYER_GSTREAMER

CC = $(MINGW_PREFIX)/bin/gcc
CXX = $(MINGW_PREFIX)/bin/g++
# CLANG64 / CLANGARM64 ship clang + LLVM tools and no gcc/binutils
ifneq ($(filter CLANG64 CLANGARM64,$(MSYSTEM)),)
CC = $(MINGW_PREFIX)/bin/clang
CXX = $(MINGW_PREFIX)/bin/clang++
PLATFORM_AR = $(firstword $(wildcard $(MINGW_PREFIX)/bin/llvm-ar.exe) $(MINGW_PREFIX)/bin/ar)
PLATFORM_RESOURCE_COMPILER = $(firstword $(wildcard $(MINGW_PREFIX)/bin/llvm-windres.exe) $(MINGW_PREFIX)/bin/windres)
else
CC = $(MINGW_PREFIX)/bin/gcc
CXX = $(MINGW_PREFIX)/bin/g++
PLATFORM_AR = $(MINGW_PREFIX)/bin/ar
PLATFORM_RESOURCE_COMPILER = $(MINGW_PREFIX)/bin/windres
endif

FIND ?= /usr/bin/find
PLATFORM_AR = $(MINGW_PREFIX)/bin/ar
#PLATFORM_LD = $(MINGW_PREFIX)/bin/ld
PLATFORM_LD = /usr/bin/lld
PLATFORM_RESOURCE_COMPILER = $(MINGW_PREFIX)/bin/windres
PLATFORM_PKG_CONFIG = $(MINGW_PREFIX)/bin/pkgconf


Expand Down
6 changes: 3 additions & 3 deletions scripts/templates/vscode/.vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@
{
"name": "Win32",
"includePath": [
"C:/msys64/mingw64/include/c++/**",
"C:/msys64/mingw64/i686-w64-mingw64/include",
"C:/msys64/ucrt64/include/c++/**",
"C:/msys64/ucrt64/include",
"${OF_INCLUDE}",
"${OF_LIBS_INCLUDE}",
"${workspaceFolder}/src/**",
Expand All @@ -130,7 +130,7 @@
]
},
"intelliSenseMode": "clang-x64",
"compilerPath": "C:/msys64/mingw64/bin/g++.exe",
"compilerPath": "C:/msys64/ucrt64/bin/g++.exe",
"configurationProvider": "ms-vscode.makefile-tools",
"mergeConfigurations": true,
"cStandard": "c17",
Expand Down
2 changes: 1 addition & 1 deletion scripts/templates/vscode/.vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"executable": "C:\\msys64\\msys2_shell.cmd",
"args": [
"-defterm",
"-mingw64",
"-ucrt64",
"-no-start",
"-here",
"-shell bash -c"
Expand Down
Loading