m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

force -static-libgcc for C++ too

Browse Source 
SDL2_ttf embeded harfbuzz is C++
This commit is contained in:
Thomas Bernard 2023-04-05 17:35:35 +02:00
parent ffd98bbd9f
commit 334cb5f1ab
No known key found for this signature in database
GPG Key ID: DB511043A31ACAAF
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/Makefile vendored
View File

@ -206,12 +206,14 @@ ifdef WIN32CROSS
WIN32 = 1 WIN32 = 1
PLATFORMDIR = -win32 PLATFORMDIR = -win32
CROSS_CC ?= $(shell which i686-w64-mingw32-gcc || which mingw32-gcc) CROSS_CC ?= $(shell which i686-w64-mingw32-gcc || which mingw32-gcc)
CROSS_CXX ?= $(shell which i686-w64-mingw32-g++ || which mingw32-g++)
CROSS_AR ?= $(shell which i686-w64-mingw32-ar || which mingw32-ar) CROSS_AR ?= $(shell which i686-w64-mingw32-ar || which mingw32-ar)
CROSS_RANLIB ?= $(shell which i686-w64-mingw32-ranlib || which mingw32-ranlib) CROSS_RANLIB ?= $(shell which i686-w64-mingw32-ranlib || which mingw32-ranlib)
CROSS_STRIP ?= $(shell which i686-w64-mingw32-strip || which mingw32-strip) CROSS_STRIP ?= $(shell which i686-w64-mingw32-strip || which mingw32-strip)
CROSS_OBJDUMP ?= $(shell which i686-w64-mingw32-objdump || which mingw32-objdump) CROSS_OBJDUMP ?= $(shell which i686-w64-mingw32-objdump || which mingw32-objdump)
CROSS_LDFLAGS += -static-libgcc CROSS_LDFLAGS += -static-libgcc
CC = $(CROSS_CC) CC = $(CROSS_CC)
CXX = $(CROSS_CXX)
AR = $(CROSS_AR) AR = $(CROSS_AR)
RANLIB = $(CROSS_RANLIB) RANLIB = $(CROSS_RANLIB)
STRIP = $(CROSS_STRIP) STRIP = $(CROSS_STRIP)
@ -391,7 +393,8 @@ $(PREFIX)/lib/libSDL2_ttf.a: $(PREFIX)/lib/libSDL2main.a
$(PREFIX)/lib/libSDL2_ttf.a: $(SDL2TTF)/.ok $(PREFIX)/lib/libSDL2_ttf.a: $(SDL2TTF)/.ok
$(MKDIR) $(SDL2TTF)/build$(PLATFORMDIR) $(MKDIR) $(SDL2TTF)/build$(PLATFORMDIR)
cd $(SDL2TTF)/build$(PLATFORMDIR) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \ cd $(SDL2TTF)/build$(PLATFORMDIR) && PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig \
CC="$(CC) $(LDFLAGS)" CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS)" \ CC="$(CC) $(LDFLAGS)" CXX="$(CXX) $(LDFLAGS)" \
CPPFLAGS=-I$(PREFIX)/include LDFLAGS="-L$(PREFIX)/lib $(LDFLAGS)" \
../configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) \ ../configure --prefix=$(PREFIX) --with-sdl-prefix=$(PREFIX) \
--with-freetype-prefix=$(PREFIX) --with-ft-prefix=$(PREFIX) --host=$(HOST) --with-freetype-prefix=$(PREFIX) --with-ft-prefix=$(PREFIX) --host=$(HOST)
cd $(SDL2TTF)/build$(PLATFORMDIR) && $(MAKE) cd $(SDL2TTF)/build$(PLATFORMDIR) && $(MAKE)