FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Simon Julier, build fixes for Cygwin/mingw

Browse Source
This commit is contained in:
Robert Osfield
2005-12-08 11:37:55 +00:00
parent 60f7607618
commit 9933c89981
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Make/instrules
View File

@@ -13,6 +13,10 @@ __instbin:
INSTALL?="$(INSTBINCMD)" __install
@$(MAKE) INSTSRC=$(TOPDIR)/lib/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_PLUGINS)\
INSTALL?="$(INSTBINCMD)" __install
ifdef IMP_LIB_EXT
@$(MAKE) INSTSRC=$(TOPDIR)/bin/$(OS)$(ARCH)/osgPlugins INSTDEST=$(INST_EXAMPLES)/osgPlugins\
INSTALL?="$(INSTBINCMD)" __install
endif
@echo >> $(INSTLOGFILE)
@echo " Run-time environment installation successful. Add "\
>> $(INSTLOGFILE)
@@ -25,7 +29,6 @@ __instbin:
@echo " to your LD_LIBRARY_PATH if not already present."\
>> $(INSTLOGFILE)
@echo >> $(INSTLOGFILE)
__instdev:
@for d in `ls -1 $(TOPDIR)/include/ | grep -v CVS`; \
@@ -69,7 +72,7 @@ __instdev:
@echo " Example programs can be found at $(INST_EXAMPLE_SRC)."\
>> $(INSTLOGFILE)
@echo >> $(INSTLOGFILE)
instlinks :
@rm -f $(INSTLOGFILE)
$(MAKE) INSTBINCMD="$(INSTLINKBINCMD)" __instbin

18
Make/makedefs
View File

@@ -549,7 +549,7 @@ ifeq ($(OS),CYGWIN)
OPTF = -O2
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared \
-Wl,--out-implib,$(TOPDIR)/lib/$(OS)$(ARCH)/lib$(TARGET_BASENAME).dll.a \
-Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \
-Wl,--export-all-symbols
EXE_EXT =.exe
@@ -581,15 +581,16 @@ ifeq ($(OS),CYGWIN)
XINE_LIBS = `xine-config --libs`
LIBINST = bin/$(OS)$(ARCH)
PLUGININST = bin/$(OS)$(ARCH)
IMP_LIBINST = lib/$(OS)$(ARCH)
PLUGININST = bin/$(OS)$(ARCH)/osgPlugins
IMP_PLUGININST = lib/$(OS)$(ARCH)/osgPlugins
LIB_PREFIX = cyg
LIB_EXT = dll
IMP_LIB_EXT = dll.a
PLUGIN_EXT = dll
LINK = cp -f
INST_LOCATION ?= /usr/local/OpenSceneGraph
INST_LIBS = $(INST_LOCATION)/bin
INST_PLUGINS = $(INST_LOCATION)/bin
INST_INCLUDE = $(INST_LOCATION)/include
INST_SHARE_PREFIX = $(INST_LOCATION)
INST_SRC = $(INST_SHARE_PREFIX)/src
@@ -611,7 +612,7 @@ ifeq ($(OS),MINGW)
OPTF = -O2
DBGF = -g -DOSG_COMPILE_UNIT_TESTS
SHARED = -shared -mthreads \
-Wl,--out-implib,$(TOPDIR)/lib/$(OS)/lib$(TARGET_BASENAME).a \
-Wl,--out-implib,lib$(TARGET_BASENAME).dll.a \
-Wl,--export-all-symbols
EXE_EXT =.exe
@@ -642,15 +643,16 @@ ifeq ($(OS),MINGW)
XINE_LIBS = `xine-config --libs`
LIBINST = bin/$(OS)$(ARCH)
PLUGININST = bin/$(OS)$(ARCH)
IMP_LIBINST = lib/$(OS)$(ARCH)
PLUGININST = bin/$(OS)$(ARCH)/osgPlugins
IMP_PLUGININST = lib/$(OS)$(ARCH)/osgPlugins
LIB_PREFIX = lib
LIB_EXT = dll
IMP_LIB_EXT = dll.a
PLUGIN_EXT = dll
LINK = cp -f
INST_LOCATION ?= /usr/local/OpenSceneGraph
INST_LIBS = $(INST_LOCATION)/bin
INST_PLUGINS = $(INST_LOCATION)/bin
INST_INCLUDE = $(INST_LOCATION)/include
INST_SHARE_PREFIX = $(INST_LOCATION)
INST_SRC = $(INST_SHARE_PREFIX)/src

13
Make/makerules
View File

@@ -120,6 +120,9 @@ $(LIB:=.dbg) :
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(LIB)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
ifdef IMP_LIB_EXT
@$(MAKE) LNSRC=$(DEBUGDIR)/lib$(TARGET_BASENAME)$(IMP_LIB_EXT) LNDEST=$(IMP_LIBINST)/lib$(TARGET_BASENAME)$(IMP_LIB_EXT) __link
endif
$(LIB:.$(LIB_EXT)=.staticdbg) :
@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
@@ -144,6 +147,9 @@ $(PLUGIN:=.dbg) :
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(PLUGIN)
@$(MAKE) LNSRC=$(DEBUGDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
ifdef IMP_LIB_EXT
@$(MAKE) LNSRC=$(DEBUGDIR)/lib$(TARGET_BASENAME)$(IMP_LIB_EXT) LNDEST=$(IMP_PLUGININST)/lib$(TARGET_BASENAME).$(IMP_LIB_EXT) __link
endif
$(PLUGIN:.$(PLUGIN_EXT)=.staticdbg) :
@[ -d $(DEBUGDIR) ] || mkdir -p $(DEBUGDIR)
@@ -169,6 +175,9 @@ $(LIB:=.opt) :
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(LIB)
@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
ifdef IMP_LIB_EXT
@$(MAKE) LNSRC=$(OPTDIR)/lib$(TARGET_BASENAME).$(IMP_LIB_EXT) LNDEST=$(IMP_LIBINST)/lib$(TARGET_BASENAME).$(IMP_LIB_EXT) __link
endif
$(LIB:.$(LIB_EXT)=.static) :
[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
@@ -178,7 +187,6 @@ $(LIB:.$(LIB_EXT)=.static) :
MAKEDEPEND=Makedepend $(STATICLIB)
@$(MAKE) LNSRC=$(OPTDIR)/$(STATICLIB) LNDEST=$(LIBINST)/$(OS)$(ARCH)/$(STATICLIB) __link
$(WRAPPER:=.opt) :
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
@cd $(OPTDIR); \
@@ -194,6 +202,9 @@ $(PLUGIN:=.opt) :
THISDIR=../$(THISDIR)\
MAKEDEPEND=Makedepend $(PLUGIN)
@$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
ifdef IMP_LIB_EXT
@$(MAKE) LNSRC=$(OPTDIR)/lib$(TARGET_BASENAME)$(IMP_LIB_EXT) LNDEST=$(IMP_PLUGININST)/lib$(TARGET_BASENAME).$(IMP_LIB_EXT) __link
endif
$(PLUGIN:.$(PLUGIN_EXT)=.static) :
@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)