libretro-blastem/trunk/libretro-blastem-flags.patch

   1 diff '--color=auto' -rupN libretro-blastem.orig/Makefile libretro-blastem/Makefile
   2 --- libretro-blastem.orig/Makefile      2021-11-14 09:30:18.467211593 +0100
   3 +++ libretro-blastem/Makefile   2021-11-14 09:37:57.666454954 +0100
   4 @@ -6,6 +6,9 @@ OS:=$(shell uname -s)
   5  endif
   6  FIXUP:=true
   7
   8 +CFLAGS:=$(CFLAGS)
   9 +LDFLAGS:=$(LDFLAGS)
  10 +
  11  BUNDLED_LIBZ:=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/gzclose.o zlib/gzlib.o zlib/gzread.o\
  12         zlib/gzwrite.o zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
  13
  14 @@ -31,8 +34,8 @@ SDL2_PREFIX:="sdl/x86_64-w64-mingw32"
  15  GLUDIR:=x64
  16  endif
  17  GLEW32S_LIB:=$(GLEW_PREFIX)/lib/Release/$(GLUDIR)/glew32s.lib
  18 -CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wpointer-arith -Werror=pointer-arith
  19 -LDFLAGS:=-lm -lmingw32 -lws2_32 -mwindows
  20 +CFLAGS+= -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wpointer-arith -Werror=pointer-arith
  21 +LDFLAGS+= -lm -lmingw32 -lws2_32 -mwindows
  22  ifneq ($(MAKECMDGOALS),libblastem.dll)
  23  CFLAGS+= -I"$(SDL2_PREFIX)/include/SDL2" -I"$(GLEW_PREFIX)/include" -DGLEW_STATIC
  24  LDFLAGS+= $(GLEW32S_LIB) -L"$(SDL2_PREFIX)/lib" -lSDL2main -lSDL2 -lopengl32 -lglu32
  25 @@ -47,7 +50,7 @@ NET:=net.o
  26  EXE:=
  27
  28  HAS_PROC:=$(shell if [ -d /proc ]; then /bin/echo -e -DHAS_PROC; fi)
  29 -CFLAGS:=-std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value  -Wpointer-arith -Werror=pointer-arith $(HAS_PROC) -DHAVE_UNISTD_H
  30 +CFLAGS+= -std=gnu99 -Wreturn-type -Werror=return-type -Werror=implicit-function-declaration -Wno-unused-value  -Wpointer-arith -Werror=pointer-arith $(HAS_PROC) -DHAVE_UNISTD_H
  31
  32  ifeq ($(OS),Darwin)
  33  LIBS=sdl2 glew
  34 @@ -89,10 +92,10 @@ ifdef USE_GLES
  35  ifndef GLES_LIB
  36  GLES_LIB:=$(shell pkg-config --libs glesv2)
  37  endif
  38 -LDFLAGS:=-lm $(GLES_LIB)
  39 +LDFLAGS+= -lm $(GLES_LIB)
  40  else
  41  CFLAGS+= -DGLEW_STATIC -Iglew/include
  42 -LDFLAGS:=-lm glew/lib/libGLEW.a
  43 +LDFLAGS+= -lm glew/lib/libGLEW.a
  44  endif
  45
  46  ifeq ($(OS),Darwin)
  47 @@ -111,10 +114,10 @@ CFLAGS+= -I$(SDL_INCLUDE_PATH)
  48
  49  else
  50  ifeq ($(MAKECMDGOALS),libblastem.$(SO))
  51 -LDFLAGS:=-lm
  52 +LDFLAGS+= -lm
  53  else
  54  CFLAGS:=$(shell pkg-config --cflags-only-I $(LIBS)) $(CFLAGS)
  55 -LDFLAGS:=-lm $(shell pkg-config --libs $(LIBS))
  56 +LDFLAGS:=-lm $(shell pkg-config --libs $(LIBS)) $(LDFLAGS)
  57  ifdef USE_FBDEV
  58  LDFLAGS+= -pthread
  59  endif