tTry again to fix linkage of main binary - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 9edaf873e8404d277113211ede9d866e9fcef06f
(DIR) parent 27ae9f6c2b199c9a8243c7b9d37995bbcdebe4fa
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Sun, 15 Nov 2020 17:52:18 -0800
Try again to fix linkage of main binary
Diffstat:
M src/Makefile.am | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
---
(DIR) diff --git a/src/Makefile.am b/src/Makefile.am
t@@ -5,12 +5,6 @@ MYLINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD)
else
MYLINK = $(CCLD)
endif
-if APPLE
-MACLDFLAGS = -framework AppKit
-else
-MACLDFLAGS =
-endif
-LINK = $(MYLINK) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MACLDFLAGS) -o $@
if GUI_CLIENT
GUISUBDIR = gui_client
t@@ -39,7 +33,14 @@ dopewars_SOURCES = admin.c admin.h AIPlayer.c AIPlayer.h util.c util.h \
AM_CPPFLAGS= -I../intl -I${srcdir} -I.. @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBCURL_CPPFLAGS@
if APPLE
dopewars_SOURCES += mac_helpers.m
+MACLDFLAGS = -framework AppKit
+else
+MACLDFLAGS =
endif
+# Since we included (even optionally) an Objective C file, automake will
+# use OBJC rather than CC to link
+LINK = $(MYLINK) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MACLDFLAGS) -o $@
+OBJCLINK = $(MYLINK) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) $(MACLDFLAGS) -o $@
DEFS = @DEFS@
PIXDIR = ${DESTDIR}${datadir}/pixmaps
DOPEDIR = ${DESTDIR}${bindir}