From c99b4b7b4d05f701c0a13f62ab0bc7c47e47faa0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 9 Dec 2005 15:05:50 +0000 Subject: [PATCH] From Simon Julier, fix for .exe extension under Mingw/Cygwin. --- Make/makedefs | 5 +++-- Make/makerules | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Make/makedefs b/Make/makedefs index 4b5fab669..54a480637 100644 --- a/Make/makedefs +++ b/Make/makedefs @@ -82,8 +82,6 @@ OBJS = $(C++FILES:.cpp=.o) \ $(CXXFILES:.cpp=.o) \ $(CFILES:.c=.o) \ -EXE_EXT = - DOF = $(OPTF) DEBUGDIR = $(OS)$(ARCH).Debug OPTDIR = $(OS)$(ARCH).Opt @@ -106,8 +104,11 @@ INSTBINCMD = install -m 755 INSTDEVCMD = install -m 644 INSTLINKBINCMD = $(LINK) INSTLINKDEVCMD = $(LINK) + LIB_PREFIX = lib LIB_EXT = so +EXE_EXT = + PLUGIN_PREFIX = osgdb_ WRAPPER_PREFIX = osgwrapper_ PLUGIN_EXT = so diff --git a/Make/makerules b/Make/makerules index 2c4840162..0c7cef792 100644 --- a/Make/makerules +++ b/Make/makerules @@ -32,10 +32,10 @@ cleandependdbg: cleantarget: cleantargetopt cleantargetdbg cleantargetopt: - @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(EXEC) $(LIB) ${WRAPPER} $(PLUGIN) + @[ -d $(OPTDIR) ] && cd $(OPTDIR); rm -f $(EXEC)$(EXE_EXT) $(LIB) ${WRAPPER} $(PLUGIN) cleantargetdbg: - @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(EXEC) $(LIB) ${WRAPPER} $(PLUGIN) + @[ -d $(DEBUGDIR) ] && cd $(DEBUGDIR); rm -f $(EXEC)$(EXE_EXT) $(LIB) ${WRAPPER} $(PLUGIN) clean: cleanopt cleandbg