Added a stop gap fix for cygwin build. Previous experiements were creating

library and plugin files that looked like system library and system files which would have deleted original files on a 'make install'. Cygwin is not tested yet, but this needed to get fixed before a cygwin user wiped out his system library files.
2002-04-07 17:47:03 +00:00
parent 1b73f9579e
commit 1a51045ea4
23 changed files with 32 additions and 2 deletions
--- a/Make/cygwin_plugin_def
+++ b/Make/cygwin_plugin_def
@@ -0,0 +1,10 @@
+
+#
+# blessed are those who try to make Windows behave like it should ...
+#
+
+ifeq ($(OS),CYGWIN)
+TARGET_BASENAME := $(PLUGIN_PREFIX)$(TARGET_BASENAME)
+PLUGIN_PREFIX := cyg
+endif
+
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -12,7 +12,6 @@ ifeq ($(findstring CYGWIN,$(OS)),CYGWIN)
 OS := CYGWIN
 endif

-
 # TOPDIR needs to be redefined for every Makefile
 TOPDIR     ?= ../
 THISDIR    = .
@@ -262,7 +261,6 @@ ifeq ($(OS),CYGWIN)

  LIB_PREFIX        = cyg
  LIB_EXT           = dll
-  PLUGIN_PREFIX     = cygosgdb_
  PLUGIN_EXT        = dll

  LINK              = cp -f
--- a/src/osgPlugins/bmp/Makefile
+++ b/src/osgPlugins/bmp/Makefile
@@ -7,6 +7,8 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = bmp
+include $(TOPDIR)/Make/cygwin_plugin_def
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/dw/Makefile
+++ b/src/osgPlugins/dw/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = dw
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/dx/Makefile
+++ b/src/osgPlugins/dx/Makefile
@@ -10,6 +10,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = dx
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/flt/Makefile
+++ b/src/osgPlugins/flt/Makefile
@@ -48,6 +48,7 @@ INC += -I$(THISDIR)
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = flt
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/gif/Makefile
+++ b/src/osgPlugins/gif/Makefile
@@ -13,6 +13,7 @@ LINKARGS += -L/usr/freeware/lib$(ARCH)
 LIBS  += $(OSG_LIBS) $(GIF_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = gif
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/jpeg/Makefile
+++ b/src/osgPlugins/jpeg/Makefile
@@ -9,6 +9,7 @@ INC += -I/usr/local/include/
 LIBS  += $(OSG_LIBS) $(JPEG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = jpeg
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/lib3ds/Makefile
+++ b/src/osgPlugins/lib3ds/Makefile
@@ -29,6 +29,7 @@ INC += -I$(THISDIR)
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = 3ds
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/lwo/Makefile
+++ b/src/osgPlugins/lwo/Makefile
@@ -11,6 +11,7 @@ INC += -I$(THISDIR)
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = lwo
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/obj/Makefile
+++ b/src/osgPlugins/obj/Makefile
@@ -11,6 +11,7 @@ INC += -I$(THISDIR)
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = obj
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/osg/Makefile
+++ b/src/osgPlugins/osg/Makefile
@@ -46,6 +46,7 @@ CXXFILES =\
 LIBS   += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = osg
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/osgtgz/Makefile
+++ b/src/osgPlugins/osgtgz/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = osgtgz
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/pfb/Makefile
+++ b/src/osgPlugins/pfb/Makefile
@@ -9,6 +9,7 @@ CXXFILES =\
 LIBS   += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = pfb
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/pic/Makefile
+++ b/src/osgPlugins/pic/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = pic
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/png/Makefile
+++ b/src/osgPlugins/png/Makefile
@@ -11,6 +11,7 @@ INC  += -I/usr/local/include\
 LINKARGS += -L/usr/freeware/lib$(ARCH)

 TARGET_BASENAME = png
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/quicktime/Makefile
+++ b/src/osgPlugins/quicktime/Makefile
@@ -8,6 +8,7 @@ CXXFILES =\
 LIBS  += $(QUICKTIME) $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = qt
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/rgb/Makefile
+++ b/src/osgPlugins/rgb/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = rgb
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tga/Makefile
+++ b/src/osgPlugins/tga/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = tga
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tgz/Makefile
+++ b/src/osgPlugins/tgz/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = tgz
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/tiff/Makefile
+++ b/src/osgPlugins/tiff/Makefile
@@ -10,6 +10,7 @@ INC     += -I/usr/local/include
 LDFLAGS += -L/usr/local/lib

 TARGET_BASENAME = tiff
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/txp/Makefile
+++ b/src/osgPlugins/txp/Makefile
@@ -31,6 +31,7 @@ INC += -I$(THISDIR)
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = txp
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules 
--- a/src/osgPlugins/zip/Makefile
+++ b/src/osgPlugins/zip/Makefile
@@ -7,6 +7,7 @@ CXXFILES =\
 LIBS  += $(OSG_LIBS) $(OTHER_LIBS)

 TARGET_BASENAME = zip
+include $(TOPDIR)/Make/cygwin_plugin_def
 PLUGIN = $(PLUGIN_PREFIX)$(TARGET_BASENAME).$(PLUGIN_EXT)

 include $(TOPDIR)/Make/makerules