Fixed link command line so that test_physfs links with libphysfs.so correctly.
This commit is contained in:
parent
25c65e2df7
commit
565f12a084
10
Makefile
10
Makefile
|
@ -156,9 +156,11 @@ TESTLDFLAGS := -lreadline
|
||||||
# Source and target names.
|
# Source and target names.
|
||||||
#-----------------------------------------------------------------------------#
|
#-----------------------------------------------------------------------------#
|
||||||
|
|
||||||
BASELIBNAME := physfs
|
PUREBASELIBNAME := physfs
|
||||||
ifneq ($(strip $(cygwin)),true)
|
ifeq ($(strip $(cygwin)),true)
|
||||||
BASELIBNAME := lib$(strip $(BASELIBNAME))
|
BASELIBNAME := $(strip $(PUREBASELIBNAME))
|
||||||
|
else
|
||||||
|
BASELIBNAME := lib$(strip $(PUREBASELIBNAME))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
MAINLIB := $(BINDIR)/$(strip $(BASELIBNAME))$(strip $(LIB_EXT))
|
MAINLIB := $(BINDIR)/$(strip $(BASELIBNAME))$(strip $(LIB_EXT))
|
||||||
|
@ -237,7 +239,7 @@ $(MAINLIB) : $(BINDIR) $(MAINOBJS)
|
||||||
$(LINKER) -o $(MAINLIB) $(LDFLAGS) $(SHAREDFLAGS) $(MAINOBJS)
|
$(LINKER) -o $(MAINLIB) $(LDFLAGS) $(SHAREDFLAGS) $(MAINOBJS)
|
||||||
|
|
||||||
$(TESTEXE) : $(MAINLIB) $(TESTOBJS)
|
$(TESTEXE) : $(MAINLIB) $(TESTOBJS)
|
||||||
$(LINKER) -o $(TESTEXE) $(LDFLAGS) $(TESTLDFLAGS) $(TESTOBJS) $(MAINLIB)
|
$(LINKER) -o $(TESTEXE) $(LDFLAGS) $(TESTLDFLAGS) $(TESTOBJS) -L$(BINDIR) -l$(strip $(PUREBASELIBNAME))
|
||||||
|
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
|
|
Loading…
Reference in New Issue