From 565f12a0841d4abfdfea77c4d37cad585429bbaa Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 29 Aug 2001 03:33:07 +0000 Subject: [PATCH] Fixed link command line so that test_physfs links with libphysfs.so correctly. --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c7aa7be7..1b79e0e9 100644 --- a/Makefile +++ b/Makefile @@ -156,9 +156,11 @@ TESTLDFLAGS := -lreadline # Source and target names. #-----------------------------------------------------------------------------# -BASELIBNAME := physfs -ifneq ($(strip $(cygwin)),true) -BASELIBNAME := lib$(strip $(BASELIBNAME)) +PUREBASELIBNAME := physfs +ifeq ($(strip $(cygwin)),true) +BASELIBNAME := $(strip $(PUREBASELIBNAME)) +else +BASELIBNAME := lib$(strip $(PUREBASELIBNAME)) endif MAINLIB := $(BINDIR)/$(strip $(BASELIBNAME))$(strip $(LIB_EXT)) @@ -237,7 +239,7 @@ $(MAINLIB) : $(BINDIR) $(MAINOBJS) $(LINKER) -o $(MAINLIB) $(LDFLAGS) $(SHAREDFLAGS) $(MAINOBJS) $(TESTEXE) : $(MAINLIB) $(TESTOBJS) - $(LINKER) -o $(TESTEXE) $(LDFLAGS) $(TESTLDFLAGS) $(TESTOBJS) $(MAINLIB) + $(LINKER) -o $(TESTEXE) $(LDFLAGS) $(TESTLDFLAGS) $(TESTOBJS) -L$(BINDIR) -l$(strip $(PUREBASELIBNAME)) install: all