nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Unify usage of $(CC) vs. $(LD) for linking to always $(LINK), set

Browse Source 
to $(CC) by default.
Necessary for C++ builds where the C++ compiler driver must be used
to link, adding libraries that the C compiler driver does not know
about.
This commit is contained in:
warwick
2003-05-28 05:36:57 +00:00
parent ad243c0286
commit 47bbe26073
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/unix/Makefile.src
+20 -10
View File
@@ -35,6 +35,9 @@ SHELL=/bin/sh
# for Atari # for Atari
# SHELL=E:/GEMINI2/MUPFEL.TTP # SHELL=E:/GEMINI2/MUPFEL.TTP
# Usually, the C compiler driver is used for linking:
LINK=$(CC)
# Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating # Pick the SYSSRC and SYSOBJ lines corresponding to your desired operating
# system. # system.
# #
@@ -71,6 +74,10 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o
# For HP/UX 10.20 with GCC: # For HP/UX 10.20 with GCC:
# CC = gcc -D_POSIX_SOURCE # CC = gcc -D_POSIX_SOURCE
# #
# For cross-compiling, eg. with gcc on Linux (see also CXX further down):
# CC = arm-linux-gcc
#
#
# if you're debugging and want gcc to check as much as possible, use: # if you're debugging and want gcc to check as much as possible, use:
# CC = gcc -W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN # CC = gcc -W -Wimplicit -Wreturn-type -Wunused -Wformat -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -DGCC_WARN
@@ -127,11 +134,11 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o
# on a Mac/BeBox: # on a Mac/BeBox:
#CC = mwcc #CC = mwcc
#CFLAGS = -r -I../include #CFLAGS = -r -I../include
#LD = mwld #LINK = mwld
#LFLAGS = -map nethack.xMAP #LFLAGS = -map nethack.xMAP
# on Intel: # on Intel:
#CFLAGS = -O -I../include #CFLAGS = -O -I../include
#LD = gcc #LINK = gcc
#LFLAGS = -Xlinker -soname=_APP_ #LFLAGS = -Xlinker -soname=_APP_
# Only used for the Gnome interface. # Only used for the Gnome interface.
@@ -148,11 +155,14 @@ CFLAGS = -O -I../include
LFLAGS = LFLAGS =
# The Qt and Be window systems are written in C++, while the rest of # The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LD line here to get # NetHack is standard C. If using Qt, uncomment the LINK line here to get
# the C++ libraries linked in. # the C++ libraries linked in.
CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
CXX=g++ CXX=g++
#LD=g++ #LINK=g++
# For cross-compiling, eg. with gcc on Linux (see also CC further up):
#CXX=arm-linux-g++
#LINK=arm-linux-gcc
# Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired
# combination of windowing systems. Also set windowing systems in config.h. # combination of windowing systems. Also set windowing systems in config.h.
@@ -382,32 +392,32 @@ $(GAME): $(SYSTEM)
Sysunix: $(HOBJ) Makefile Sysunix: $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading ..."
@$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) $(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
@touch Sysunix @touch Sysunix
Sys3B2: $(HOBJ) Makefile Sys3B2: $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading ..."
@$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) -lmalloc
@touch Sys3B2 @touch Sys3B2
Sysatt: $(HOBJ) Makefile Sysatt: $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading ..."
@$(LD) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ) @$(LINK) $(LFLAGS) /lib/crt0s.o /lib/shlib.ifile -o $(GAME) $(HOBJ)
@touch Sysatt @touch Sysatt
Systos: $(HOBJ) Makefile Systos: $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading ..."
@$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
@touch Systos @touch Systos
SysV-AT: DUMB.Setup $(HOBJ) Makefile SysV-AT: DUMB.Setup $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading ..."
@$(CC) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB)
@touch SysV-AT @touch SysV-AT
SysBe: $(HOBJ) Makefile SysBe: $(HOBJ) Makefile
@echo "Loading ..." @echo "Loading ..."
@$(LD) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS) @$(LINK) $(LFLAGS) -o $(GAME) $(HOBJ) $(WINLIB) $(LIBS)
@xres -o $(GAME) ../win/BeOS/nethack.rsrc @xres -o $(GAME) ../win/BeOS/nethack.rsrc
@mimeset -f $(GAME) @mimeset -f $(GAME)
@touch SysBe @touch SysBe