summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authordillo <dillo>2004-11-02 02:22:22 +0000
committerdillo <dillo>2004-11-02 02:22:22 +0000
commit73b074a484b9fb8cd2d33a2f2074876bf6d4a31f (patch)
treecdee865a76509a1de1d9e902f7ed1a101374e52a /emulators
parent8eaac8b58c85fb381d9dfd3eb368581c8a8a7d94 (diff)
downloadpkgsrc-73b074a484b9fb8cd2d33a2f2074876bf6d4a31f.tar.gz
Note that this package uses C++.
Use $(CXX) to link C++ program, honour CFLAGS. Avoid use of pattern rules in package Makefile so this works without GNU make. Oked by wiz.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/Cygne-SDL/Makefile3
-rw-r--r--emulators/Cygne-SDL/distinfo4
-rw-r--r--emulators/Cygne-SDL/patches/patch-aa40
3 files changed, 33 insertions, 14 deletions
diff --git a/emulators/Cygne-SDL/Makefile b/emulators/Cygne-SDL/Makefile
index 55a72efefbd..e5b10f921bd 100644
--- a/emulators/Cygne-SDL/Makefile
+++ b/emulators/Cygne-SDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/15 22:03:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/02 02:22:22 dillo Exp $
#
DISTNAME= Cygne-SDL-0.1-src
@@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR}/Cygne-SDL-0.1/src
USE_BUILDLINK3= yes
MAKEFILE= Makefiles/Makefile.unix
NO_CONFIGURE= yes
+USE_LANGUAGES= c c++
# Uses i386 assembly code
ONLY_FOR_PLATFORM= *-*-i386
diff --git a/emulators/Cygne-SDL/distinfo b/emulators/Cygne-SDL/distinfo
index 5f2e5b31b3e..bf106e77dc8 100644
--- a/emulators/Cygne-SDL/distinfo
+++ b/emulators/Cygne-SDL/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/23 19:01:40 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/11/02 02:22:22 dillo Exp $
SHA1 (Cygne-SDL-0.1-src.tar.gz) = f9c50702d1911d0ff1728e5aa089e67cfdfd0030
Size (Cygne-SDL-0.1-src.tar.gz) = 106448 bytes
-SHA1 (patch-aa) = 9f23ff20e32950b2821654ca8269ebe82294e8b6
+SHA1 (patch-aa) = c57821d127898b840346616ad0d2b8be9e0efd7b
SHA1 (patch-ab) = 89789c935f2865a015a72cf11621971d8b43b538
SHA1 (patch-ac) = bee744a1b007158d681da122615bab3d8414b824
SHA1 (patch-ad) = 120c1df8c521c1ffbd7750335730849ac921dc41
diff --git a/emulators/Cygne-SDL/patches/patch-aa b/emulators/Cygne-SDL/patches/patch-aa
index 0dc06c618a0..86ba2d2a61b 100644
--- a/emulators/Cygne-SDL/patches/patch-aa
+++ b/emulators/Cygne-SDL/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/23 19:01:40 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/02 02:22:22 dillo Exp $
--- Makefiles/Makefile.unix.orig 2002-03-26 17:50:55.000000000 +0100
+++ Makefiles/Makefile.unix
@@ -1,5 +1,4 @@
-CC = gcc
-LD = gcc
-+LD = g++
++#LD = g++
NASM = nasm
### Include and lib stuff ####
@@ -18,10 +18,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/23 19:01:40 wiz Exp $
- -fschedule-insns2 -fstrength-reduce -malign-double -mfancy-math-387 -ffast-math -fforce-addr \
- -fforce-mem `sdl-config --cflags` \
- -L$(STDLIB) -L$(SDLLIB) -I$(STDINCLUDE) -I$(SDLINCLUDE)
-+CFLAGS = -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__ `sdl-config --cflags`
++CFLAGS += -DUNIX -DTARGET_UNIX -DGCC -DUSES_16BIT_ONLY -D__SDL__
-LDFLAGS = $(CFLAGS)
-+LDFLAGS = $(CFLAGS) `sdl-config --libs`
++LDFLAGS += `sdl-config --libs`
TARGET = cygne
@@ -30,15 +30,33 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/07/23 19:01:40 wiz Exp $
LIBS = `sdl-config --libs` -lz
-@@ -37,7 +32,10 @@ THECC = $(CC) $(CFLAGS) $(INCS)
- %.o: %.cpp
- $(THECC) -c $< -o $@
+@@ -28,17 +23,22 @@ INCS = -I. `sdl-config --cflags`
--cygne: $(OBJ) Makefile
-+unzip.o:
-+ $(THECC) -c zlib/unzip.c -o $@
+ THECC = $(CC) $(CFLAGS) $(INCS)
+
+-%.o: %.asm
++.SUFFIXES: .asm
++
++.asm.o:
+ $(NASM) -f elf -o $@ $<
+
+-%.o: %.c
+- $(THECC) -c $< -o $@
++.c.o:
++ $(CC) $(CFLAGS) $(INCS) -c $< -o $@
+
++.cpp.o:
++ $(CXX) $(CFLAGS) $(INCS) -c $< -o $@
+
+-%.o: %.cpp
+- $(THECC) -c $< -o $@
++unzip.o:
++ $(CC) $(CFLAGS) $(INCS) -c zlib/unzip.c -o $@
+
+-cygne: $(OBJ) Makefile
+- $(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+cygne: $(OBJ)
- $(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
clean:
+ rm -f cygne *.o zlib/*.o