From 58f3786a3595b5919ae4748d0721cd39ceb66e87 Mon Sep 17 00:00:00 2001 From: David Chavez Date: Thu, 7 Jul 2022 00:49:45 +0200 Subject: [PATCH] [macos] Distribute optimized builds (#599) --- Jenkinsfile | 8 ++++---- libultraship/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b4cfd3167..74e33c1b1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,9 +106,9 @@ pipeline { mv ZAPDTR/ZAPD.out build/assets/extractor/ mv README.md readme.txt - docker exec sohcont appimage/appimage.sh + docker exec sohcont appimage/appimage.sh - 7z a soh-linux.7z SOH-Linux.AppImage readme.txt + 7z a soh-linux.7z SOH-Linux.AppImage readme.txt ''' } @@ -137,8 +137,8 @@ pipeline { sh ''' cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64 cd soh - make setup -j4 DEBUG=0 CC=gcc-12 CXX=g++-12 - make -j4 DEBUG=0 CC=gcc-12 CXX=g++-12 + make setup -j4 DEBUG=0 OPTFLAGS=-O2 CC=gcc-12 CXX=g++-12 + make -j4 DEBUG=0 OPTFLAGS=-O2 CC=gcc-12 CXX=g++-12 make -j4 appbundle mv ../README.md readme.txt 7z a soh-mac.7z soh.app readme.txt diff --git a/libultraship/Makefile b/libultraship/Makefile index 9dd148821..2d0b1b606 100644 --- a/libultraship/Makefile +++ b/libultraship/Makefile @@ -22,7 +22,7 @@ WARN := -Wall -Wextra -Werror \ -Wno-error=multichar CWARN := -CXXWARN := -Wno-deprecated-enum-enum-conversion +CXXWARN := -Wno-deprecated-enum-enum-conversion -Wno-error=maybe-uninitialized CXXFLAGS := $(WARN) $(CXXWARN) -std=c++20 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0 CFLAGS := $(WARN) $(CWARN) -std=c99 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0