pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ti99sim: Update to 0.16.0.10



Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon%NetBSD.org@localhost>
Pushed By:	outpaddling
Date:		Tue Oct 8 17:01:58 2024 -0500
Changeset:	1e34142d454643d0d487157f106b47e9cb25e72b

Modified Files:
	ti99sim/Makefile
	ti99sim/distinfo
Removed Files:
	ti99sim/files/ti99sim-setup
	ti99sim/patches/patch-Makefile.linux
	ti99sim/patches/patch-include_common.hpp
	ti99sim/patches/patch-include_platform.hpp
	ti99sim/patches/patch-rules.mak
	ti99sim/patches/patch-src_Makefile
	ti99sim/patches/patch-src_console_Makefile
	ti99sim/patches/patch-src_core_device-support.cpp
	ti99sim/patches/patch-src_core_stateobject.cpp
	ti99sim/patches/patch-src_sdl_Makefile
	ti99sim/patches/patch-src_util_Makefile

Log Message:
ti99sim: Update to 0.16.0.10

Upstream patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1e34142d454643d0d487157f106b47e9cb25e72b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ti99sim/Makefile                                  |  19 ++--
 ti99sim/distinfo                                  |  16 +---
 ti99sim/files/ti99sim-setup                       |  83 -----------------
 ti99sim/patches/patch-Makefile.linux              |  26 ------
 ti99sim/patches/patch-include_common.hpp          |  28 ------
 ti99sim/patches/patch-include_platform.hpp        |  17 ----
 ti99sim/patches/patch-rules.mak                   | 103 ----------------------
 ti99sim/patches/patch-src_Makefile                |  26 ------
 ti99sim/patches/patch-src_console_Makefile        |  14 ---
 ti99sim/patches/patch-src_core_device-support.cpp |  14 ---
 ti99sim/patches/patch-src_core_stateobject.cpp    |  14 ---
 ti99sim/patches/patch-src_sdl_Makefile            |  14 ---
 ti99sim/patches/patch-src_util_Makefile           |  54 ------------
 13 files changed, 12 insertions(+), 416 deletions(-)

diffs:
diff --git a/ti99sim/Makefile b/ti99sim/Makefile
index 9fe3d21d5c..9a017cb571 100644
--- a/ti99sim/Makefile
+++ b/ti99sim/Makefile
@@ -5,17 +5,21 @@
 #              Mon Oct  7 11:59:41 CDT 2024               #
 ###########################################################
 
-DISTNAME=	${PKGNAME}.src
-PKGNAME=	ti99sim-${PV}
+DISTNAME=	ti99sim-0.16.0.10
 CATEGORIES=	emulators
-MASTER_SITES=	https://www.mrousseau.org/programs/ti99sim/archives/
-EXTRACT_SUFX=	.tar.xz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=outpaddling/}
+GITHUB_TAG=	379951e7f342af873e8a8a98e2c47ab6f760194a
 
 OWNER=		bacon%NetBSD.org@localhost
 HOMEPAGE=	https://www.mrousseau.org/programs/ti99sim/
 COMMENT=	SDL-based TI-99/4a simulator
 LICENSE=	gnu-gpl-v3
 
+SUBST_CLASSES+=		prefix
+SUBST_STAGE.prefix=	pre-configure
+SUBST_SED.prefix=	-e 's|/usr/local|${PREFIX}|g'
+SUBST_FILES.prefix=	scripts/ti99sim-setup
+
 # Test and change if necessary.
 # MAKE_JOBS_SAFE=	no
 
@@ -23,7 +27,6 @@ LICENSE=	gnu-gpl-v3
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
-WRKSRC=		${WRKDIR}/ti99sim-${PV}
 # FIXME: Is it necessary for binaries to exist in DATADIR, or can
 # BIN_DIR be ${PREFIX}/bin?
 MAKE_FLAGS+=	DATA_DIR=${DESTDIR}${DATADIR} \
@@ -33,14 +36,10 @@ MAKE_FLAGS+=	DATA_DIR=${DESTDIR}${DATADIR} \
 # FIXME: This shouldn't be needed
 LDFLAGS+=	-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lcrypto
 
-PV=		0.16.0
 DATADIR=	${PREFIX}/share/ti99sim
 
-post-patch:
-	${SED} -e 's|/usr/local|${PREFIX}|g' ${FILESDIR}/ti99sim-setup > ${WRKDIR}/ti99sim-setup
-
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/ti99sim-setup ${DESTDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/ti99sim-setup ${DESTDIR}${PREFIX}/bin
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
diff --git a/ti99sim/distinfo b/ti99sim/distinfo
index 78c7d59fd2..ff1fe6fde6 100644
--- a/ti99sim/distinfo
+++ b/ti99sim/distinfo
@@ -1,15 +1,5 @@
 $NetBSD$
 
-BLAKE2s (ti99sim-0.16.0.src.tar.xz) = b6cd23be4a8e281f926a82726409d466651ae03f69fb9a431d1ce44a2d93b09c
-SHA512 (ti99sim-0.16.0.src.tar.xz) = 5636b1ecbaf7da10ecaea2d59aac0d84f03934065c02d3441576e4675a6d818ca21e3af80caddfa9fef640f6e0bef093a09082ec0d453df87b67431d7f5c0fec
-Size (ti99sim-0.16.0.src.tar.xz) = 193760 bytes
-SHA1 (patch-Makefile.linux) = 5e97cd887fdd8762a7caa95ec789295a40c4f3dd
-SHA1 (patch-include_common.hpp) = 6a0e63c88eb988b8c8f52ca3bfa435179c206ed4
-SHA1 (patch-include_platform.hpp) = 351c26f2c5d3697009ed41398a00981743fea317
-SHA1 (patch-rules.mak) = 2c370ccccc7f775d48c453aedb09bab37532ec35
-SHA1 (patch-src_Makefile) = 973ef9f28c277d4be8f67b8e7d55f3e314acc797
-SHA1 (patch-src_console_Makefile) = 79e5b9c710d005facfa7641f2ec129e9f72241b1
-SHA1 (patch-src_core_device-support.cpp) = 77042bb0d1fb5e348a98a6694bc3ee57f1ee7943
-SHA1 (patch-src_core_stateobject.cpp) = 4abda2c067e115d341976c0a92bd7cdff7b0c56b
-SHA1 (patch-src_sdl_Makefile) = 2cb0bda9c81110f6ee03739ceb5160cb872f34f1
-SHA1 (patch-src_util_Makefile) = e2f64a450229b737f6f70cdf67f43ff8dfeefe07
+BLAKE2s (ti99sim-0.16.0.10-379951e7f342af873e8a8a98e2c47ab6f760194a.tar.gz) = c3cc4f8db43b49fb2f05c4e5c0df1588729dc172ffa04d1ddd2e5a4ed0a9327f
+SHA512 (ti99sim-0.16.0.10-379951e7f342af873e8a8a98e2c47ab6f760194a.tar.gz) = 042d7b2411992fac10a35599819239d5b8fb86e1d79a76112296760464c5a9bce4d22de8c64a4647eeb7e274e29d1341adb0c8f11523b4ef5be13db925210899
+Size (ti99sim-0.16.0.10-379951e7f342af873e8a8a98e2c47ab6f760194a.tar.gz) = 270505 bytes
diff --git a/ti99sim/files/ti99sim-setup b/ti99sim/files/ti99sim-setup
deleted file mode 100755
index 9d59625fe7..0000000000
--- a/ti99sim/files/ti99sim-setup
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-root=/usr/local/share/ti99sim
-
-tmpdir=$(mktemp -d)
-cd $tmpdir
-
-for fetch in fetch wget curl notfound; do
-    if which $fetch; then
-	break
-    fi
-done
-if [ $fetch = notfound ]; then
-    exit 1
-elif [ $fetch = curl ]; then
-    fetch='curl -O'
-fi
-
-$fetch http://ftp.whtech.com/System%20ROMs/MAME/pre_0.174/ti99_complete.zip
-$fetch http://ftp.whtech.com/System%20ROMs/MAME/ti99_gkracker.zip
-$fetch http://ftp.whtech.com/emulators/mess/mess_modules.zip
-
-unzip -oq ti99_complete ti99_4a.zip
-unzip -oq ti99_complete ti99_4qi.zip
-unzip -oq ti99_complete ti99_fdc.zip
-unzip -oq ti99_complete ti99_pcode.zip
-unzip -oq ti99_complete ti99_speech.zip
-
-cp $root/roms/cf7a+.bin .
-
-unzip -oq ti99_4a.zip '*.bin'
-unzip -oq ti99_4qi.zip '*.bin'
-unzip -oq ti99_fdc.zip '*.bin'
-unzip -oq ti99_pcode.zip '*.bin'
-unzip -oq ti99_speech.zip '*.bin'
-unzip -oq ti99_gkracker.zip '*.bin'
-
-convert-ctg $root/roms/cf7+.dat
-convert-ctg $root/roms/gram-kracker.dat
-convert-ctg $root/roms/ti-994a.dat
-convert-ctg $root/roms/ti-994a-qi.dat
-convert-ctg $root/roms/ti-disk.dat
-convert-ctg $root/roms/ti-pcard.dat
-
-mkdir -p ~/.ti99sim
-
-if [ -d /home/pi/RetroPie ]; then
-	if [ ! -d ~/.ti99sim/console ]; then
-		mkdir -p /home/pi/RetroPie/BIOS/ti99
-		ln -s /home/pi/RetroPie/BIOS/ti99 ~/.ti99sim/console
-	fi
-	if [ ! -d ~/.ti99sim/cartridges ]; then
-		mkdir -p /home/pi/RetroPie/roms/ti99
-		ln -s /home/pi/RetroPie/roms/ti99 ~/.ti99sim/cartridges
-	fi
-fi
-
-mkdir -p ~/.ti99sim/console
-mkdir -p ~/.ti99sim/cartridges
-mkdir -p ~/.ti99sim/disks
-
-if [ ! -f ~/.ti99sim/disks/image.cf7 ]; then
-	tmpdisk=$(mktemp -uq)
-	disk --create=sssd $tmpdisk > /dev/null
-	disk --output=cf7+ --filename=image.cf7#32 $tmpdisk > /dev/null
-	rm $tmpdisk
-	yes -n | mv -i image.cf7 ~/.ti99sim/disks
-fi
-
-yes -n | mv -i *ctg ~/.ti99sim/console
-yes -n | mv -i spchrom.bin ~/.ti99sim/console
-
-unzip -oq mess_modules -d roms
-yes -n | mv -i roms/minimem*.bin .
-
-convert-ctg $root/roms/mini-memory.dat
-mkcart roms
-
-yes -n | mv -i *ctg ~/.ti99sim/cartridges
-
-cd -
-
-rm -Rf $tmpdir
diff --git a/ti99sim/patches/patch-Makefile.linux b/ti99sim/patches/patch-Makefile.linux
deleted file mode 100644
index 9c272c0464..0000000000
--- a/ti99sim/patches/patch-Makefile.linux
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-# Install ROMs, symlinks are problematic with destdir
-
---- Makefile.linux.orig	2020-05-25 20:52:22.000000000 +0000
-+++ Makefile.linux
-@@ -46,15 +46,18 @@ install: ti99sim
- 	@$(INSTALL) -d $(DATA_DIR)/cartridges
- 	@$(INSTALL) -d $(DATA_DIR)/console
- 	@$(INSTALL) -d $(DATA_DIR)/disks
-+	@$(INSTALL) -d $(DATA_DIR)/roms
- 	@$(INSTALL) -d $(BIN_DIR)
-+	@$(INSTALL) -d $(SYS_BIN)
- 	@for target in $(ITARGETS); do \
- 	   $(INSTALL) -s $$target $(BIN_DIR); \
- 	 done
- 	@if [ $(BIN_DIR) != $(SYS_BIN) ]; then \
- 	   for target in $(notdir $(ITARGETS)); do \
--	     ln -f -s $(BIN_DIR)/$$target $(SYS_BIN)/$$target; \
-+	     cp $(BIN_DIR)/$$target $(SYS_BIN)/$$target; \
- 	   done \
- 	fi
-+	$(INSTALL) roms/* $(DATA_DIR)/roms
- 
- uninstall:
- 	@for target in $(notdir $(ITARGETS)); do \
diff --git a/ti99sim/patches/patch-include_common.hpp b/ti99sim/patches/patch-include_common.hpp
deleted file mode 100644
index 07f6ed4984..0000000000
--- a/ti99sim/patches/patch-include_common.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-# Locate endian.h on macOS
-
---- include/common.hpp.orig	2020-05-25 20:52:23.000000000 +0000
-+++ include/common.hpp
-@@ -111,14 +111,18 @@ template <typename T, size_t N> char( &A
- 
- 	#endif
- 
-+#elif defined (OS_MACOSX)
-+
-+	#include <machine/endian.h>
-+
- #else
- 
- 	// Use the environments endian definitions
- 	#include <endian.h>
- 
--	#define BIG_ENDIAN		__BIG_ENDIAN
--	#define LITTLE_ENDIAN	__LITTLE_ENDIAN
--	#define BYTE_ORDER		__BYTE_ORDER
-+	//#define BIG_ENDIAN		__BIG_ENDIAN
-+	//#define LITTLE_ENDIAN	__LITTLE_ENDIAN
-+	//#define BYTE_ORDER		__BYTE_ORDER
- 
- #endif
- 
diff --git a/ti99sim/patches/patch-include_platform.hpp b/ti99sim/patches/patch-include_platform.hpp
deleted file mode 100644
index 8682481a4c..0000000000
--- a/ti99sim/patches/patch-include_platform.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-# Document misleading code
-
---- include/platform.hpp.orig	2024-10-06 12:13:54 UTC
-+++ include/platform.hpp
-@@ -35,6 +35,10 @@
- 		#define OS_WINDOWS
- 	#endif
- 
-+// FIXME: __GNUC__ is defined under clang as well, but using OS_LINUX
-+// for all Unix variants encourages developers to assume linuxisms
-+// where they won't work.  Maybe define OS_UNIX for portable code
-+// and just use OS_LINUX for linux-specific code.
- #elif defined( __GNUC__ )
- 
- 	#if ! defined( OS_LINUX )
diff --git a/ti99sim/patches/patch-rules.mak b/ti99sim/patches/patch-rules.mak
deleted file mode 100644
index 19502b73a2..0000000000
--- a/ti99sim/patches/patch-rules.mak
+++ /dev/null
@@ -1,103 +0,0 @@
-$NetBSD$
-
-# Portability
-
---- rules.mak.orig	2020-05-25 20:52:22.000000000 +0000
-+++ rules.mak
-@@ -12,23 +12,18 @@ ifndef CXX
- CXX      := g++
- endif
- 
--ifneq (,$(findstring /,$(shell whereis ccache)))
--CXX      := ccache $(CXX)
--endif
--
- CFLAGS   += --std=c++2a
- CFLAGS   += -fno-strict-aliasing -fexceptions -fPIC
- CFLAGS   += -fdata-sections -ffunction-sections
- CFLAGS   += -funsigned-char
-+CFLAGS   += -Wno-deprecated-declarations
- 
--LFLAGS   += -Wl,--gc-sections
--LFLAGS   += -rdynamic
--
--XLIBS    += -lstdc++fs
-+LDFLAGS   += -Wl,--gc-sections
-+LDFLAGS   += -rdynamic
- 
- WARNINGS := -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
- WARNINGS += -Wno-implicit-fallthrough
--WARNINGS += -Wno-maybe-uninitialized
-+WARNINGS += -Wno-uninitialized
- WARNINGS += -Wcast-qual
- 
- INCLUDES := -I../../include
-@@ -41,20 +36,16 @@ ifeq ($(CFG),Debug)
- DEBUG    := 1
- endif
- 
--ifdef ARCH
--CFLAGS   += -march=$(ARCH)
--endif
--
- ifdef LTO
- CFLAGS   += -flto
--LFLAGS   += -flto
-+LDFLAGS   += -flto
- endif
- 
- ifdef DEBUG
- CFLAGS   += -g3 -O0 -DDEBUG
- else
- CFLAGS   += -g3 -O3 -fomit-frame-pointer
--LFLAGS   += -g3 -O3
-+LDFLAGS   += -g3 -O3
- endif
- 
- ifdef LOGGER
-@@ -74,12 +65,17 @@ endif
- 
- ifeq ($(OSTYPE),Linux)
- OS       := OS_LINUX
-+XLIBS	 += -lstdc++fs
- endif
- 
- ifeq ($(OSTYPE),FreeBSD)
- OS       := OS_LINUX
- endif
- 
-+ifeq ($(OSTYPE),NetBSD)
-+OS       := OS_LINUX
-+endif
-+
- ifeq ($(OSTYPE),Darwin)
- CXX      := c++
- OS       := OS_MACOSX
-@@ -102,20 +98,20 @@ CFLAGS   += -D$(OS)
- DF        = $(CFG)/$(*F)
- 
- $(CFG)/%.o : %.cpp
--	@echo $<
--	@$(CXX) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -MD -o $@ $<
--	@cp $(DF).d $(DF).dep; \
-+	echo $<
-+	$(CXX) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -MD -o $@ $<
-+	cp $(DF).d $(DF).dep; \
- 		sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- 			-e '/^$$/ d' -e 's/$$/ :/' < $(DF).d >> $(DF).dep; \
- 		rm -f $(DF).d
- 
- $(CFG)/%.o : %.m
--	@echo $<
--	@$(CC) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -o $@ $<
-+	echo $<
-+	$(CC) -c $(CFLAGS) $(WARNINGS) $(INCLUDES) -o $@ $<
- 
- %.h.gch: %.h
--	@echo Generating pre-compiled header for $<
--	@$(CXX) $(CFLAGS) $(WARNINGS) $(INCLUDES) $<
-+	echo Generating pre-compiled header for $<
-+	$(CXX) $(CFLAGS) $(WARNINGS) $(INCLUDES) $<
- 
- .SUFFIXES: .cpp .c .o
- 
diff --git a/ti99sim/patches/patch-src_Makefile b/ti99sim/patches/patch-src_Makefile
deleted file mode 100644
index 7e79f96548..0000000000
--- a/ti99sim/patches/patch-src_Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
-# Respect env $(MAKE)
-
---- src/Makefile.orig	2020-05-25 20:52:22.000000000 +0000
-+++ src/Makefile
-@@ -1,11 +1,11 @@
- all:
--	@make -C core
--	@make -C console
--	@make -C sdl
--	@make -C util
-+	$(MAKE) -C core
-+	$(MAKE) -C console
-+	$(MAKE) -C sdl
-+	$(MAKE) -C util
- 
- clean:
--	@make -C core clean
--	@make -C console clean
--	@make -C sdl clean
--	@make -C util clean
-+	$(MAKE) -C core clean
-+	$(MAKE) -C console clean
-+	$(MAKE) -C sdl clean
-+	$(MAKE) -C util clean
diff --git a/ti99sim/patches/patch-src_console_Makefile b/ti99sim/patches/patch-src_console_Makefile
deleted file mode 100644
index fbf6365852..0000000000
--- a/ti99sim/patches/patch-src_console_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-# Use standard LDFLAGS
-
---- src/console/Makefile.orig	2020-05-25 20:52:22.000000000 +0000
-+++ src/console/Makefile
-@@ -33,6 +33,6 @@ $(BINDIR):
- 	mkdir -p $@
- 
- $(BINDIR)/ti99sim-console: $(OBJS) $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- -include $(FILES:%.cpp=$(CFG)/%.dep)
diff --git a/ti99sim/patches/patch-src_core_device-support.cpp b/ti99sim/patches/patch-src_core_device-support.cpp
deleted file mode 100644
index 71c05e870d..0000000000
--- a/ti99sim/patches/patch-src_core_device-support.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-# Fix build
-
---- src/core/device-support.cpp.orig	2024-10-04 12:23:39 UTC
-+++ src/core/device-support.cpp
-@@ -27,6 +27,7 @@
- //----------------------------------------------------------------------------
- 
- #include <regex>
-+#include <cstring>
- #include "idevice.hpp"
- #include "icomputer.hpp"
- #include "cartridge.hpp"
diff --git a/ti99sim/patches/patch-src_core_stateobject.cpp b/ti99sim/patches/patch-src_core_stateobject.cpp
deleted file mode 100644
index da8c55051e..0000000000
--- a/ti99sim/patches/patch-src_core_stateobject.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-# Fix build
-
---- src/core/stateobject.cpp.orig	2024-10-03 22:18:01 UTC
-+++ src/core/stateobject.cpp
-@@ -31,6 +31,7 @@
- #include <cstdio>
- #include <iomanip>
- #include <fstream>
-+#include <sstream>
- #include "common.hpp"
- #include "logger.hpp"
- #include "stateobject.hpp"
diff --git a/ti99sim/patches/patch-src_sdl_Makefile b/ti99sim/patches/patch-src_sdl_Makefile
deleted file mode 100644
index 6e3c464470..0000000000
--- a/ti99sim/patches/patch-src_sdl_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-# Use standard LDFLAGS
-
---- src/sdl/Makefile.orig	2020-05-25 20:52:22.000000000 +0000
-+++ src/sdl/Makefile
-@@ -43,6 +43,6 @@ $(BINDIR):
- 	mkdir -p $@
- 
- $(TARGET): $(OBJS) $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- -include $(FILES:%.cpp=$(CFG)/%.dep)
diff --git a/ti99sim/patches/patch-src_util_Makefile b/ti99sim/patches/patch-src_util_Makefile
deleted file mode 100644
index 8db3d35c11..0000000000
--- a/ti99sim/patches/patch-src_util_Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD$
-
-# Use standard LDFLAGS
-
---- src/util/Makefile.orig	2020-05-25 20:52:22.000000000 +0000
-+++ src/util/Makefile
-@@ -58,36 +58,36 @@ $(BINDIR):
- 	mkdir -p $@
- 
- $(BINDIR)/catalog: $(CFG)/catalog.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/convert-ctg: $(CFG)/convert.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/decode: $(CFG)/decode.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/disk: $(CFG)/disk.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/dumpcpu: $(CFG)/dumpcpu.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/dumpgrom: $(CFG)/dumpgrom.o gpl.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/dumpspch: $(CFG)/dumpspch.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/list: $(CFG)/list.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/mkcart: $(CFG)/mkcart.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/mkspch: $(CFG)/mkspch.o $(LIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- $(BINDIR)/say: $(CFG)/say.o tms9919-sdl.o $(LIBS) $(SDLLIBS)
--	$(CXX) -o $@ $(LFLAGS) $^ $(XLIBS)
-+	$(CXX) -o $@ $(LDFLAGS) $^ $(XLIBS)
- 
- -include $(FILES:%.cpp=$(CFG)/%.dep)


Home | Main Index | Thread Index | Old Index