diff --git a/srcpkgs/prototype/patches/build.patch b/srcpkgs/prototype/patches/build.patch index e22b3b0b0e2..38dda960987 100644 --- a/srcpkgs/prototype/patches/build.patch +++ b/srcpkgs/prototype/patches/build.patch @@ -1,36 +1,12 @@ ---- Makefile.orig 2019-05-29 19:03:53.594802724 +0200 -+++ Makefile 2019-05-29 19:11:57.443458314 +0200 -@@ -1,11 +1,12 @@ - CPP = g++ -+ - ifeq ($(ODROID),1) - CXXFLAGS = -O3 -fsigned-char -fdiagnostics-color=auto -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard -fsingle-precision-constant -g -ffast-math -I./ -I/usr/include/GL -Wno-write-strings -DODROID +--- Makefile ++++ Makefile +@@ -4,8 +4,7 @@ LDFLAGS = -lGL -lm DEST = /usr/local else ifeq ($(LINUX),1) -CXXFLAGS = -O2 -g -I./ -I/usr/include/GL -Wno-write-strings -LDFLAGS = -lGL -lm -+CXXFLAGS ?= -O2 -g -I./ -I/usr/include/GL -Wno-write-strings -+LIBS = -lGL -lm ++LDFLAGS += -lGL -lm DEST = /usr/local else ifeq ($(AMIGAOS4),1) ifeq ($(SDL2),1) -@@ -50,9 +51,9 @@ LDFLAGS += -lfmod - else - CXXFLAGS += -DNO_FMOD - ifeq ($(SDL2),1) --LDFLAGS += -lSDL2_mixer -+SDL_LDFLAGS += -lSDL2_mixer - else --LDFLAGS += -lSDL_mixer -+SDL_LDFLAGS += -lSDL_mixer - endif - endif - endif -@@ -76,5 +77,5 @@ clean: - - $(PROGRAM): $(OBJS) $(LIBS) - @echo "Linking $(PROGRAM) ..." -- $(LD) -o $(PROGRAM) $(OBJS) $(LDFLAGS) $(SDL_LDFLAGS) -+ $(LD) -o $(PROGRAM) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LDFLAGS) - diff --git a/srcpkgs/prototype/template b/srcpkgs/prototype/template index a9f58d57f91..03d8f26c39b 100644 --- a/srcpkgs/prototype/template +++ b/srcpkgs/prototype/template @@ -9,12 +9,11 @@ license="Public Domain" homepage="https://github.com/ptitSeb/prototype" distfiles="https://github.com/ptitSeb/prototype/archive/v${version}.tar.gz" checksum=400f8a5c727c9feaa6b48b65c23c312db41dd238af9526659bf3342346c05af6 -nocross=yes CXXFLAGS="-Wno-write-strings" do_build() { - make SDL2=1 LINUX=1 CPP=$CXX ${makejobs} + make SDL2=1 LINUX=1 CPP=$CXX LD=$CXX ${makejobs} } do_install() { vmkdir usr/libexec/prototype