tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update CI env to have GCC 12 for using c++20

Browse Source 
1. Update Makefile to use c++20.
2. Update appveyor.yml to use MSYS2 (GCC 12).

Close #12292
This commit is contained in:
ozone10 2022-10-06 14:57:46 +02:00 committed by Don Ho
parent 3b8446d8ce
commit bcaf0f00b5
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/gcc/makefile
View File

@ -37,7 +37,7 @@ LEXILLA_DIRECTORY := ../../lexilla
LEXILLA_TARGET := liblexilla.a LEXILLA_TARGET := liblexilla.a
CXX := $(CROSS_COMPILE)g++ CXX := $(CROSS_COMPILE)g++
CXXFLAGS := -include $(GCC_DIRECTORY)/gcc-fixes.h -std=c++17 -Wno-conversion-null CXXFLAGS := -include $(GCC_DIRECTORY)/gcc-fixes.h -std=c++20
RC := $(CROSS_COMPILE)windres RC := $(CROSS_COMPILE)windres
RCFLAGS := RCFLAGS :=
CPP_PATH := $(SCINTILLA_DIRECTORY)/include $(LEXILLA_DIRECTORY)/include CPP_PATH := $(SCINTILLA_DIRECTORY)/include $(LEXILLA_DIRECTORY)/include
@ -59,7 +59,7 @@ LDFLAGS += -s
else else
BUILD_TYPE := debug BUILD_TYPE := debug
BUILD_SUFFIX := -debug BUILD_SUFFIX := -debug
CXXFLAGS += -Og -g -Wall -Wpedantic -Wconversion-null CXXFLAGS += -Og -g -Wall -Wpedantic
CPP_DEFINE += DEBUG CPP_DEFINE += DEBUG
endif endif

12
appveyor.yml
View File

@ -93,9 +93,17 @@ for:
only: only:
- compiler: GCC - compiler: GCC
install: install:
- set PATH=C:\msys64\usr\bin
- if "%platform%" EQU "i686" set $env:MSYSTEM = 'MINGW32'
- if "%platform%" EQU "x86_64" set $env:MSYSTEM = 'MINGW64'
- if "%configuration%" EQU "Debug" set DEBUG=1 - if "%configuration%" EQU "Debug" set DEBUG=1
- if "%platform%" EQU "i686" set PATH=C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;%PATH:C:\Program Files\Git\usr\bin;=% # uncomment lines below to update packages to use latest gcc
- if "%platform%" EQU "x86_64" set PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=% #- bash -lc "pacman --noconfirm -Syuu"
#- bash -lc "pacman --noconfirm -Syuu"
#- if "%platform%" EQU "i686" bash -lc "pacman --noconfirm -S mingw-w64-i686-gcc mingw-w64-i686-make"
#- if "%platform%" EQU "x86_64" bash -lc "pacman --noconfirm -S mingw-w64-x86_64-gcc mingw-w64-x86_64-make"
- if "%platform%" EQU "i686" set PATH=C:\msys64\mingw32\bin;%PATH:C:\Program Files\Git\usr\bin;=%
- if "%platform%" EQU "x86_64" set PATH=C:\msys64\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=%
build_script: build_script:
- mingw32-make -f PowerEditor\gcc\makefile - mingw32-make -f PowerEditor\gcc\makefile
after_build: after_build: