mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-22 11:51:17 +00:00
we now define LIBDIR when we build targets
This commit is contained in:
parent
bb5623aa9e
commit
f11f71d8a7
5 changed files with 10 additions and 5 deletions
|
@ -15,6 +15,7 @@ DESTDIR :=
|
|||
prefix := @prefix@
|
||||
exec_prefix := @exec_prefix@
|
||||
bindir := @bindir@
|
||||
libdir := @libdir@
|
||||
mandir := @mandir@
|
||||
|
||||
TARGET_DIR := $(PROJECT_ODIR)/targets
|
||||
|
|
|
@ -747,6 +747,7 @@ AC_EXEEXT
|
|||
AC_OBJEXT
|
||||
|
||||
|
||||
AC_SUBST(libdir)
|
||||
AC_SUBST(RELEASE)
|
||||
AC_SUBST(RELEASE_CFLAGS)
|
||||
AC_SUBST(HAS_XIL)
|
||||
|
|
|
@ -16,6 +16,7 @@ DESTDIR :=
|
|||
prefix := @prefix@
|
||||
exec_prefix := @exec_prefix@
|
||||
bindir := @bindir@
|
||||
libdir := @libdir@
|
||||
mandir := @mandir@
|
||||
|
||||
TARGET_DIR := $(PROJECT_ODIR)/targets
|
||||
|
@ -183,8 +184,8 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
|
|||
# Directory specific stuff
|
||||
#
|
||||
DEFS = @DEFS@
|
||||
CFLAGS += @CFLAGS@ -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. \
|
||||
$(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_ODIR) -I$(COMMON_DIR)
|
||||
CFLAGS += @CFLAGS@ -DQUAKEWORLD -DLIBDIR=\"$(libdir)\" $(OPTFLAGS) $(DEFS) \
|
||||
-I. $(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_ODIR) -I$(COMMON_DIR)
|
||||
|
||||
GENERAL_SRC = $(CL_COMMON_SRC) \
|
||||
$(QW_CL_SRC) $(QW_NET_SRC) net_chan.c skin.c \
|
||||
|
|
|
@ -16,6 +16,7 @@ DESTDIR =
|
|||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
libdir = @libdir@
|
||||
mandir = @mandir@
|
||||
|
||||
BUILD_DIR = $(PROJECT_ODIR)/targets/qw_server
|
||||
|
@ -84,7 +85,7 @@ all: $(targets)
|
|||
ALL_SRV_OBJS = $(patsubst %,$(BUILD_DIR)/%, $(addsuffix .@OBJEXT@,\
|
||||
$(basename $(ALL_QW_SRV_SRC) .c .s)))
|
||||
|
||||
SRV_CFLAGS = -DSRV $(X_CFLAGS)
|
||||
SRV_CFLAGS = -DSRV -DLIBDIR=\"$(libdir)\" $(X_CFLAGS)
|
||||
# FIXME: Don't use X_EXTRA_LIBS below
|
||||
SRV_LDFLAGS = @X_EXTRA_LIBS@
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ DESTDIR =
|
|||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = @bindir@
|
||||
libdir = @libdir@
|
||||
mandir = @mandir@
|
||||
|
||||
TARGET_DIR = $(PROJECT_ODIR)/targets
|
||||
|
@ -195,8 +196,8 @@ CL_COMMON_SRC = $(MISC_SRC) $(CL_GUI_SRC) $(CL_SRC) \
|
|||
# Directory specific stuff
|
||||
#
|
||||
DEFS = @DEFS@
|
||||
CFLAGS += @CFLAGS@ $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) \
|
||||
-I$(COMMON_ODIR) -I$(COMMON_DIR) -DUQUAKE
|
||||
CFLAGS += @CFLAGS@ -DUQUAKE -DLIBDIR=\"$(libdir)\" $(OPTFLAGS) \
|
||||
$(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_ODIR) -I$(COMMON_DIR)
|
||||
|
||||
GENERAL_SRC = $(CL_COMMON_SRC) \
|
||||
$(SYS_SRC) world.c $(SRV_PR_SRC) \
|
||||
|
|
Loading…
Reference in a new issue