Thu May 9 23:24:18 2019 UTC ()
libretro-reicast: Update to 20190508

pkgsrc changes:

* Attempt to detect supported OpenGL versions. Enable OIT support on
MesaLib>=12.
* Support aarch64 dynamic recompiler.

Changes:

*  lightgun crosshair for GLES mode
*  Twin Stick support (+ Saturn Twin-Stick helper mode)
*  Custom textures loading and dumping
*  Check CDI version to avoid loading any crap as a CDI image and crashing
*  Get rid of /data/ folder in custom textures path. Flip images up/down
*  arm64 dynarec
*  x64 dynarec optimization
*  OSX: build fix
*  revert a change not intended for anything but osx
*  android x64 build fix
*  arm64: direct mem access and crash fix
*  x64 dynarec: only use AVX/SSE3/FMA extensions when available
*  arm64: new AICA dynarec and improvement to the sh4 one
*  arm64 DSP dynarec
*  Pad dsp_t to keep savestates compatibility
*  Fix render to texture buffer alpha channel for 1555
*  generic dynarec was always used if compiled in
*  Support for redump.org CUE file format
*  Makefile change for cue file format
*  x64 dynarec: loss of precision with RSQRTSS and other fixes
*  missing #include
*  arm64: fix DSP dynarec crash
*  New core option: frame skipping
*  Enable RTT to buffer for Flag to Flag
*  naomi: avoid crash on exit if m4 cart fails to load
*  Implement CH2 DMA to 32-bit vram
*  OIT: reset scale param to 640x480 for final quad
*  GL: Ignore RTT upscale params when rendering to buffer
*  implement disk eject/open state
*  Implement soft reset. Fix Atomiswave flash sector size. TAWriteSQ 32bits
*  Aica: fix adpcm decoding
*  include TCW in HD texture hash
*  gdrom: stop playing cdda when switching disk
*  maple: reconnect devices after 100ms to allow the game to detect it
*  gl: performance optimizations for slow devices
*  fix race condition when loading custom/HD textures
*  fix scissor test and vertical scaling when using the Y scaler
*  Ignore scalefactor if < 0x400
*  Fix crash at startup when purupuru pack is disabled
*  Clang buildix
*  Introduce HAVE_CLANG option
*  Add m3u playlist support.
*  Added DLOW_END to enable better performance OOTB on classics/rpi and added a8a35 platform
*  Fixed LOW_END DEFINES
*  Remove dupe res from LOW_END
*  Fixed broadact and forced threaded rendering by default. Added LOW RES mode and added to classics only ATM.
*  NAOMI: Add sambaa & set parent for samba clones
*  Sync naomi roms with mame 0.206
*  (NAOMI) Check parent folder for gdrom
*  (NAOMI) Oops
*  (NAOMI) Fix folder detected as file
*  (NAOMI) Update romsets
*  Fix doa2 romsets
*  (libretro) Rework input init
*  Merge pull request #520 from libretro/bdm/input-init-rework
*  Add eeprom dumps
*  Handle auto-rotate
*  Implement some eeproms (vertical, pstone2, alpilot)
*  Update naomi_roms.h
*  Custom tex: Use retro_stat for path handling. Fix deadlock on exit (win32)
*  x64 dynarec: fix windows crash


(nia)
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-reicast/MESSAGE
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-reicast/options.mk
diff -r1.4 -r1.5 pkgsrc/emulators/libretro-reicast/Makefile
diff -r1.4 -r1.5 pkgsrc/emulators/libretro-reicast/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/libretro-reicast/patches/patch-Makefile
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-reicast/Attic/MESSAGE (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-reicast/Attic/MESSAGE 2018/10/15 17:53:23 1.2
+++ pkgsrc/emulators/libretro-reicast/Attic/MESSAGE 2019/05/09 23:24:17 1.3
@@ -1,17 +1,20 @@ @@ -1,17 +1,20 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE,v 1.2 2018/10/15 17:53:23 nia Exp $ 2$NetBSD: MESSAGE,v 1.3 2019/05/09 23:24:17 nia Exp $
3 3
4Reicast requires the following BIOS files in order to work: 4Reicast requires the following BIOS files in order to work:
5 5
6SHA256 (dc/dc_boot.bin) = 6SHA256 (dc/dc_boot.bin) =
788d6a666495ad14ab5988d8cb730533cfc94ec2cfd53a7eeda14642ab0d4abf9 788d6a666495ad14ab5988d8cb730533cfc94ec2cfd53a7eeda14642ab0d4abf9
8 8
9SHA256 (dc/dc_flash.bin) = 9SHA256 (dc/dc_flash.bin) =
10dd8b365521a9c08bb4c170da3592212580f7251f35a45d6083774d1c030bc3e3 10dd8b365521a9c08bb4c170da3592212580f7251f35a45d6083774d1c030bc3e3
11 11
12In retroarch, you'll need to place them in the System Directory. 12In retroarch, you'll need to place them in the System Directory.
13 13
14Alternatively, you can place them in your Content Directory next to the 14Alternatively, you can place them in your Content Directory next to the
15software you are going to run. 15software you are going to run.
16 16
 17RetroArch's "glcore" video driver seems to not work. Make sure you're
 18using "gl" instead.
 19
17=========================================================================== 20===========================================================================
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-reicast/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-reicast/Attic/options.mk 2018/10/14 03:35:44 1.2
+++ pkgsrc/emulators/libretro-reicast/Attic/options.mk 2019/05/09 23:24:17 1.3
@@ -1,28 +1,41 @@ @@ -1,28 +1,41 @@
1# $NetBSD: options.mk,v 1.2 2018/10/14 03:35:44 nia Exp $ 1# $NetBSD: options.mk,v 1.3 2019/05/09 23:24:17 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-reicast 3PKG_OPTIONS_VAR= PKG_OPTIONS.libretro-reicast
4PKG_OPTIONS_REQUIRED_GROUPS= graphics 4PKG_OPTIONS_REQUIRED_GROUPS= graphics
5PKG_OPTIONS_GROUP.graphics= opengl 5PKG_OPTIONS_GROUP.graphics= opengl
6 6
7.include "../../mk/bsd.fast.prefs.mk" 7.include "../../mk/bsd.fast.prefs.mk"
8 8
9.if !empty(MACHINE_ARCH:M*arm*) 9.if !empty(MACHINE_ARCH:M*arm*)
10PKG_OPTIONS_GROUP.graphics+= rpi 10PKG_OPTIONS_GROUP.graphics+= rpi
11.endif 11.endif
12 12
13.if !empty(MACHINE_ARCH:Mearm*) && ${OPSYS} == "NetBSD" 13.if !empty(MACHINE_ARCH:Mearm*) && ${OPSYS} == "NetBSD"
14PKG_SUGGESTED_OPTIONS+= rpi 14PKG_SUGGESTED_OPTIONS+= rpi
15.else 15.else
16PKG_SUGGESTED_OPTIONS+= opengl 16PKG_SUGGESTED_OPTIONS+= opengl
17.endif 17.endif
18 18
19.include "../../mk/bsd.options.mk" 19.include "../../mk/bsd.options.mk"
20 20
21.if !empty(PKG_OPTIONS:Mopengl) 21.if !empty(PKG_OPTIONS:Mopengl)
22MAKE_FLAGS+= HAVE_GL3=1 
23.include "../../graphics/MesaLib/buildlink3.mk" 22.include "../../graphics/MesaLib/buildlink3.mk"
 23# Try to detect which GL versions are supported.
 24# OIT requires OpenGL 4.3
 25. if !empty(BUILTIN_VERSION.Mesa)
 26MESA_MAJOR_VER= ${BUILTIN_VERSION.Mesa:C/\..*//gW}
 27. if ${MESA_MAJOR_VER} >= 12
 28MAKE_FLAGS+= HAVE_OIT=1
 29. elif ${MESA_MAJOR_VER} >= 8
 30MAKE_FLAGS+= HAVE_GL3=1
 31. elif ${MESA_MAJOR_VER} >= 7
 32MAKE_FLAGS+= HAVE_GL2=1
 33. endif
 34. else
 35MAKE_FLAGS+= HAVE_GL3=1
 36. endif
24.elif !empty(PKG_OPTIONS:Mrpi) 37.elif !empty(PKG_OPTIONS:Mrpi)
25MAKE_FLAGS+= GLES=1 38MAKE_FLAGS+= GLES=1
26MAKE_FLAGS+= GL_LIB="-lbrcmGLESv2" 39MAKE_FLAGS+= GL_LIB="-lbrcmGLESv2"
27.include "../../misc/raspberrypi-userland/buildlink3.mk" 40.include "../../misc/raspberrypi-userland/buildlink3.mk"
28.endif 41.endif
cvs diff -r1.4 -r1.5 pkgsrc/emulators/libretro-reicast/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-reicast/Attic/Makefile 2019/01/02 20:07:15 1.4
+++ pkgsrc/emulators/libretro-reicast/Attic/Makefile 2019/05/09 23:24:17 1.5
@@ -1,50 +1,52 @@ @@ -1,50 +1,52 @@
1# $NetBSD: Makefile,v 1.4 2019/01/02 20:07:15 nia Exp $ 1# $NetBSD: Makefile,v 1.5 2019/05/09 23:24:17 nia Exp $
2 2
3DISTNAME= libretro-reicast-20181223 3DISTNAME= libretro-reicast-20190508
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/}
6GITHUB_PROJECT= reicast-emulator 6GITHUB_PROJECT= reicast-emulator
7GITHUB_TAG= 3dd45d27159278e88a73352a318d0b23bc241a1a 7GITHUB_TAG= 8c38fcedbe064f7fbda9c2213fd6987b7d4e4dbc
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://docs.libretro.com/library/reicast/ 10HOMEPAGE= https://docs.libretro.com/library/reicast/
11COMMENT= Libretro core based on the Reicast Sega Dreamcast emulator 11COMMENT= Libretro core based on the Reicast Sega Dreamcast emulator
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14EXTRACT_USING= bsdtar 14EXTRACT_USING= bsdtar
15USE_TOOLS+= gmake 15USE_TOOLS+= gmake
16USE_LANGUAGES= c c++11 16USE_LANGUAGES= c c++11
17 17
18MAKE_FLAGS+= platform=unix 18MAKE_FLAGS+= platform=unix
19MAKE_FLAGS+= HAVE_OPENMP=0 19MAKE_FLAGS+= HAVE_OPENMP=0
20MAKE_FLAGS+= HAVE_LTCG=0 20MAKE_FLAGS+= HAVE_LTCG=0
21MAKE_FLAGS+= SINGLE_PREC_FLAGS=1 21MAKE_FLAGS+= SINGLE_PREC_FLAGS=1
22MAKE_FLAGS+= GIT_VERSION="-pkgsrc" 22MAKE_FLAGS+= GIT_VERSION="-pkgsrc"
23MAKE_FLAGS+= CC_AS=${AS:Q} 23MAKE_FLAGS+= CC_AS=${AS:Q}
24 24
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26 26
27.if ${MACHINE_ARCH} == "x86_64" 27.if ${MACHINE_ARCH} == "x86_64"
28MAKE_FLAGS+= WITH_DYNAREC=x86_64 28MAKE_FLAGS+= WITH_DYNAREC=x86_64
29.elif ${MACHINE_ARCH} == "i386" 29.elif ${MACHINE_ARCH} == "i386"
30MAKE_FLAGS+= WITH_DYNAREC=x86 30MAKE_FLAGS+= WITH_DYNAREC=x86
 31.elif ${MACHINE_ARCH} == "aarch64"
 32MAKE_FLAGS+= WITH_DYNAREC=arm64
31.elif !empty(MACHINE_ARCH:M*arm*) 33.elif !empty(MACHINE_ARCH:M*arm*)
32CFLAGS+= -marm 34CFLAGS+= -marm
33MAKE_FLAGS+= WITH_DYNAREC=arm 35MAKE_FLAGS+= WITH_DYNAREC=arm
34.elif !empty(MACHINE_ARCH:M*mips*) 36.elif !empty(MACHINE_ARCH:M*mips*)
35MAKE_FLAGS+= WITH_DYNAREC=mips 37MAKE_FLAGS+= WITH_DYNAREC=mips
36.else 38.else
37MAKE_FLAGS+= WITH_DYNAREC= 39MAKE_FLAGS+= WITH_DYNAREC=
38.endif 40.endif
39 41
40BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=link.T 42BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=link.T
41BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-no-undefined 43BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,-no-undefined
42 44
43INSTALLATION_DIRS+= ${PREFIX}/lib/libretro 45INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
44 46
45do-install: 47do-install:
46 ${INSTALL_LIB} ${WRKSRC}/reicast_libretro.so \ 48 ${INSTALL_LIB} ${WRKSRC}/reicast_libretro.so \
47 ${DESTDIR}${PREFIX}/lib/libretro/reicast_libretro.so 49 ${DESTDIR}${PREFIX}/lib/libretro/reicast_libretro.so
48 50
49.include "options.mk" 51.include "options.mk"
50.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/emulators/libretro-reicast/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-reicast/Attic/distinfo 2019/01/02 20:07:15 1.4
+++ pkgsrc/emulators/libretro-reicast/Attic/distinfo 2019/05/09 23:24:17 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2019/01/02 20:07:15 nia Exp $ 1$NetBSD: distinfo,v 1.5 2019/05/09 23:24:17 nia Exp $
2 2
3SHA1 (libretro-reicast-20181223-3dd45d27159278e88a73352a318d0b23bc241a1a.tar.gz) = eed1c244e0d9942e184229796dfb1bb73e9c7e93 3SHA1 (libretro-reicast-20190508-8c38fcedbe064f7fbda9c2213fd6987b7d4e4dbc.tar.gz) = e9199c1488c6ea9d1fdaa235d224a084117dcce0
4RMD160 (libretro-reicast-20181223-3dd45d27159278e88a73352a318d0b23bc241a1a.tar.gz) = 961b5c80e9996f72c1181b05b4d2b0c79c7b1e89 4RMD160 (libretro-reicast-20190508-8c38fcedbe064f7fbda9c2213fd6987b7d4e4dbc.tar.gz) = f48d93863cdb9c28682359b7ea0e2f76814c81ae
5SHA512 (libretro-reicast-20181223-3dd45d27159278e88a73352a318d0b23bc241a1a.tar.gz) = 81253a0151c78d41ce96b443ff246f0f77679c686e88a2260259a3a4cd66fc4f68b4815f09e45b56c06562de9f988019517f9cc762a0b9ac3f9bd20b722ac451 5SHA512 (libretro-reicast-20190508-8c38fcedbe064f7fbda9c2213fd6987b7d4e4dbc.tar.gz) = 65463f18c7e49bda396ee5beb5a1bc39f5c58e047b37ee3857200a97ebb0a0854a2dc79f520ddc5afc0aeebff73baf60e28d79091c8306dbd035715c507f2fc1
6Size (libretro-reicast-20181223-3dd45d27159278e88a73352a318d0b23bc241a1a.tar.gz) = 1700568 bytes 6Size (libretro-reicast-20190508-8c38fcedbe064f7fbda9c2213fd6987b7d4e4dbc.tar.gz) = 2613651 bytes
7SHA1 (patch-Makefile) = 019d6902baa03e4cd0b1a6a80ca75e6ace3a1715 7SHA1 (patch-Makefile) = 7d76517bc1b1630f4f598d85d8db62f040ea7a7d
8SHA1 (patch-core_hw_sh4_dyna_driver.cpp) = 6d00a7297f528fe3389a13872095da80200a9013 8SHA1 (patch-core_hw_sh4_dyna_driver.cpp) = 6d00a7297f528fe3389a13872095da80200a9013
9SHA1 (patch-core_libretro_common.cpp) = b1291f55ced1dc92087d31270f8bc582c2db6fc5 9SHA1 (patch-core_libretro_common.cpp) = b1291f55ced1dc92087d31270f8bc582c2db6fc5
cvs diff -r1.2 -r1.3 pkgsrc/emulators/libretro-reicast/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-reicast/patches/Attic/patch-Makefile 2018/12/18 01:55:45 1.2
+++ pkgsrc/emulators/libretro-reicast/patches/Attic/patch-Makefile 2019/05/09 23:24:18 1.3
@@ -1,27 +1,34 @@ @@ -1,27 +1,34 @@
1$NetBSD: patch-Makefile,v 1.2 2018/12/18 01:55:45 nia Exp $ 1$NetBSD: patch-Makefile,v 1.3 2019/05/09 23:24:18 nia Exp $
2 2
3Don't override pkgsrc-set variables. 3Don't override pkgsrc-set variables.
4 4
5Don't make assumptions based on uname. 5Don't make assumptions based on uname.
6 6
7--- Makefile.orig 2018-12-13 14:07:07.000000000 +0000 7--- Makefile.orig 2019-05-08 14:25:11.000000000 +0000
8+++ Makefile 8+++ Makefile
9@@ -20,41 +20,12 @@ HAVE_CHD := 1 9@@ -21,48 +21,12 @@ HAVE_CLANG := 0
10  10
11 TARGET_NAME := reicast 11 TARGET_NAME := reicast
12  12
13-CXX = ${CC_PREFIX}g++ 13-ifeq ($(HAVE_CLANG),1)
14-CC = ${CC_PREFIX}gcc 14- CXX = ${CC_PREFIX}clang++
 15- CC = ${CC_PREFIX}clang
 16- SHARED := -fuse-ld=lld
 17-else
 18- CXX = ${CC_PREFIX}g++
 19- CC = ${CC_PREFIX}gcc
 20- SHARED :=
 21-endif
15-CC_AS = ${CC_PREFIX}as 22-CC_AS = ${CC_PREFIX}as
16- 23-
17-MFLAGS :=  24-MFLAGS :=
18-ASFLAGS :=  25-ASFLAGS :=
19-LDFLAGS := 26-LDFLAGS :=
20-LDFLAGS_END := 27-LDFLAGS_END :=
21-INCFLAGS := 28-INCFLAGS :=
22-LIBS := 29-LIBS :=
23-CFLAGS :=  30-CFLAGS :=
24-CXXFLAGS := 31-CXXFLAGS :=
25- 32-
26-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)" 33-GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
27 ifneq ($(GIT_VERSION)," unknown") 34 ifneq ($(GIT_VERSION)," unknown")
@@ -38,52 +45,67 @@ Don't make assumptions based on uname. @@ -38,52 +45,67 @@ Don't make assumptions based on uname.
38- ARCH = $(shell uname -m) 45- ARCH = $(shell uname -m)
39-endif 46-endif
40- 47-
41-# Target Dynarec 48-# Target Dynarec
42-WITH_DYNAREC = $(ARCH) 49-WITH_DYNAREC = $(ARCH)
43- 50-
44-ifeq ($(ARCH), $(filter $(ARCH), i386 i686)) 51-ifeq ($(ARCH), $(filter $(ARCH), i386 i686))
45- WITH_DYNAREC = x86 52- WITH_DYNAREC = x86
46-endif 53-endif
47- 54-
48 ifeq ($(platform),) 55 ifeq ($(platform),)
49 platform = unix 56 platform = unix
50 ifeq ($(UNAME),) 57 ifeq ($(UNAME),)
51@@ -631,10 +602,6 @@ endif 58@@ -727,7 +691,7 @@ ifeq ($(HAVE_GL3), 1)
 59 CORE_DEFINES += -DHAVE_GL3
 60 endif
 61
 62-RZDCY_CFLAGS += $(CFLAGS) -c $(OPTFLAGS) -frename-registers -ffast-math -ftree-vectorize -fomit-frame-pointer
 63+RZDCY_CFLAGS += $(CFLAGS) -c -frename-registers -ffast-math -ftree-vectorize -fomit-frame-pointer
 64
 65 ifeq ($(WITH_DYNAREC), arm)
 66 ifneq (,$(findstring odroid,$(platform)))
 67@@ -785,10 +749,6 @@ endif
52  68
53 RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fexceptions -fno-rtti -std=gnu++11 69 RZDCY_CXXFLAGS := $(RZDCY_CFLAGS) -fexceptions -fno-rtti -std=gnu++11
54  70
55-ifeq (,$(findstring msvc,$(platform))) 71-ifeq (,$(findstring msvc,$(platform)))
56- CORE_DEFINES += -funroll-loops 72- CORE_DEFINES += -funroll-loops
57-endif 73-endif
58- 74-
59 ifeq ($(HAVE_OIT), 1) 75 ifeq ($(HAVE_OIT), 1)
60 HAVE_CORE = 1 76 HAVE_CORE = 1
61 CORE_DEFINES += -DHAVE_OIT -DHAVE_GL4 77 CORE_DEFINES += -DHAVE_OIT -DHAVE_GL4
62@@ -695,7 +662,7 @@ RZDCY_CXXFLAGS += $(CORE_DEFINES) 78@@ -849,7 +809,7 @@ RZDCY_CXXFLAGS += $(CORE_DEFINES)
63 CFLAGS += $(CORE_DEFINES) 79 CFLAGS += $(CORE_DEFINES)
64 CXXFLAGS += $(CORE_DEFINES) 80 CXXFLAGS += $(CORE_DEFINES)
65  81
66-CFLAGS += $(OPTFLAGS) -c 82-CFLAGS += $(OPTFLAGS) -c
67+CFLAGS += -c 83+CFLAGS += -c
68 CFLAGS += -fno-strict-aliasing -ffast-math 84 CFLAGS += -fno-strict-aliasing -ffast-math
69 CXXFLAGS += -fno-rtti -fpermissive -fno-operator-names 85 CXXFLAGS += -fno-rtti -fpermissive -fno-operator-names
70 LIBS += -lm  86 LIBS += -lm
71@@ -743,15 +710,15 @@ $(TARGET): $(OBJECTS) 87@@ -897,20 +857,20 @@ $(TARGET): $(OBJECTS)
72 ifeq ($(STATIC_LINKING), 1) 88 ifeq ($(STATIC_LINKING), 1)
73 $(AR) rcs $@ $(OBJECTS) 89 $(AR) rcs $@ $(OBJECTS)
74 else 90 else
75- $(LD) $(MFLAGS) $(fpic) $(SHARED) $(LDFLAGS) $(OBJECTS) $(LDFLAGS_END) $(GL_LIB) $(LIBS) -o $@ 91- $(LD) $(MFLAGS) $(fpic) $(SHARED) $(LDFLAGS) $(OBJECTS) $(LDFLAGS_END) $(GL_LIB) $(LIBS) -o $@
76+ $(LD) $(fpic) $(SHARED) $(LDFLAGS) $(OBJECTS) $(LDFLAGS_END) $(GL_LIB) $(LIBS) -o $@ 92+ $(CC) $(fpic) $(SHARED) $(LDFLAGS) $(OBJECTS) $(LDFLAGS_END) $(GL_LIB) $(LIBS) -o $@
77 endif 93 endif
78 @echo "** BUILD SUCCESSFUL! GG NO RE **" 
79  94
80 %.o: %.cpp 95 %.o: %.cpp
81- $(CXX) $(INCFLAGS) $(CFLAGS) $(MFLAGS) $(CXXFLAGS) $< -o $@ 96- $(CXX) $(INCFLAGS) $(CFLAGS) $(MFLAGS) $(CXXFLAGS) $< -o $@
82+ $(CXX) $(INCFLAGS) $(CFLAGS) $(CXXFLAGS) $< -o $@ 97+ $(CXX) $(INCFLAGS) $(CFLAGS) $(CXXFLAGS) $< -o $@
83  98
84 %.o: %.c 99 %.o: %.c
85- $(CC) $(INCFLAGS) $(CFLAGS) $(MFLAGS) $< -o $@ 100- $(CC) $(INCFLAGS) $(CFLAGS) $(MFLAGS) $< -o $@
86+ $(CC) $(INCFLAGS) $(CFLAGS) $< -o $@ 101+ $(CC) $(INCFLAGS) $(CFLAGS) $< -o $@
87  102
88 %.o: %.S 103 %.o: %.S
89 $(CC_AS) $(ASFLAGS) $(INCFLAGS) $< -o $@ 104 $(CC_AS) $(ASFLAGS) $(INCFLAGS) $< -o $@
 105
 106 %.o: %.cc
 107- $(CXX) $(INCFLAGS) $(CFLAGS) $(MFLAGS) $(CXXFLAGS) $< -o $@
 108+ $(CXX) $(INCFLAGS) $(CFLAGS) $(CXXFLAGS) $< -o $@
 109
 110 clean:
 111 rm -f $(OBJECTS) $(TARGET)