From 3d71ba842ce5967f6198ac5aa65ee3bca1aff43d Mon Sep 17 00:00:00 2001 From: Andreas Meyer Date: Wed, 12 Jul 2006 21:58:39 +0000 Subject: [PATCH] better support for LEDA4.x and LEDA5.x --- .gitattributes | 8 +++---- Installation/config/support/S60-LEDA | 4 ++-- Installation/config/support/S61-LEDAWIN | 2 +- Installation/config/support/S62-LEDAMS | 4 ++-- Installation/config/support/S63-LEDAWINMS | 2 +- .../support/{S64-LEDAOLD => S64-LEDA5X} | 9 ++++---- .../support/{S65-LEDAOLDWIN => S65-LEDA5XWIN} | 4 ++-- .../support/{S66-LEDAOLDMS => S66-LEDA5XMS} | 4 ++-- .../{S67-LEDAOLDWINMS => S67-LEDA5XWINMS} | 4 ++-- Installation/config/support/test_LEDA.cpp | 22 ++++++++++++++----- 10 files changed, 38 insertions(+), 25 deletions(-) rename Installation/config/support/{S64-LEDAOLD => S64-LEDA5X} (53%) rename Installation/config/support/{S65-LEDAOLDWIN => S65-LEDA5XWIN} (82%) rename Installation/config/support/{S66-LEDAOLDMS => S66-LEDA5XMS} (82%) rename Installation/config/support/{S67-LEDAOLDWINMS => S67-LEDA5XWINMS} (73%) diff --git a/.gitattributes b/.gitattributes index 196244cc842..114d9dc50e2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -452,10 +452,10 @@ Installation/config/support/S60-LEDA -text Installation/config/support/S61-LEDAWIN -text Installation/config/support/S62-LEDAMS -text Installation/config/support/S63-LEDAWINMS -text -Installation/config/support/S64-LEDAOLD -text -Installation/config/support/S65-LEDAOLDWIN -text -Installation/config/support/S66-LEDAOLDMS -text -Installation/config/support/S67-LEDAOLDWINMS -text +Installation/config/support/S64-LEDA5X -text +Installation/config/support/S65-LEDA5XWIN -text +Installation/config/support/S66-LEDA5XMS -text +Installation/config/support/S67-LEDA5XWINMS -text Installation/config/support/S80-QT3MT -text Installation/config/support/S81-QT3ST -text Installation/config/support/S82-QT3MSMT -text diff --git a/Installation/config/support/S60-LEDA b/Installation/config/support/S60-LEDA index 9632214422f..8999dafe74a 100644 --- a/Installation/config/support/S60-LEDA +++ b/Installation/config/support/S60-LEDA @@ -1,6 +1,6 @@ # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = Unix +DESCRIPTION = 4.x for Unix PROVIDES = LEDA CXXFLAGS = LDFLAGS = @@ -8,7 +8,7 @@ LIBS = P G L REQUIRES = INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER STDINCLDIRS = -INCLTHING = LEDA/system/basic.h +INCLTHING = LEDA/basic.h STDLIBDIRS = LIBTHING = diff --git a/Installation/config/support/S61-LEDAWIN b/Installation/config/support/S61-LEDAWIN index 0c137b5fad0..df3b0a35600 100644 --- a/Installation/config/support/S61-LEDAWIN +++ b/Installation/config/support/S61-LEDAWIN @@ -1,6 +1,6 @@ # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = Unix +DESCRIPTION = 4.x for Unix PROVIDES = LEDAWIN CXXFLAGS = LDFLAGS = diff --git a/Installation/config/support/S62-LEDAMS b/Installation/config/support/S62-LEDAMS index 8444431e4b9..ac62cd50fc9 100644 --- a/Installation/config/support/S62-LEDAMS +++ b/Installation/config/support/S62-LEDAMS @@ -1,6 +1,6 @@ # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = MS Windows +DESCRIPTION = 4.x for MS Windows PROVIDES = LEDA CXXFLAGS = LDFLAGS = @@ -8,7 +8,7 @@ LIBS = P G L REQUIRES = DOLLAR_WINDOWS_COMPILER INCOMPATIBLE = STDINCLDIRS = -INCLTHING = LEDA/system/basic.h +INCLTHING = LEDA/basic.h STDLIBDIRS = LIBTHING = diff --git a/Installation/config/support/S63-LEDAWINMS b/Installation/config/support/S63-LEDAWINMS index 90e7be1d308..c1356939912 100644 --- a/Installation/config/support/S63-LEDAWINMS +++ b/Installation/config/support/S63-LEDAWINMS @@ -1,6 +1,6 @@ # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = MS Windows +DESCRIPTION = 4.x for MS Windows PROVIDES = LEDAWIN CXXFLAGS = LDFLAGS = diff --git a/Installation/config/support/S64-LEDAOLD b/Installation/config/support/S64-LEDA5X similarity index 53% rename from Installation/config/support/S64-LEDAOLD rename to Installation/config/support/S64-LEDA5X index c73c04c5e02..1df9d155be9 100644 --- a/Installation/config/support/S64-LEDAOLD +++ b/Installation/config/support/S64-LEDA5X @@ -1,15 +1,16 @@ # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = Unix -PROVIDES = LEDAOLD +DESCRIPTION = 5.x for Unix +PROVIDES = LEDA5X CXXFLAGS = LDFLAGS = LIBS = P G L REQUIRES = -INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER +INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER LEDA STDINCLDIRS = -INCLTHING = LEDA/basic.h +INCLTHING = LEDA/system/basic.h STDLIBDIRS = LIBTHING = +COMPILETESTFLAGS = -DHAVE_LEDA5X # EOF diff --git a/Installation/config/support/S65-LEDAOLDWIN b/Installation/config/support/S65-LEDA5XWIN similarity index 82% rename from Installation/config/support/S65-LEDAOLDWIN rename to Installation/config/support/S65-LEDA5XWIN index ce55a2748c3..85706509620 100644 --- a/Installation/config/support/S65-LEDAOLDWIN +++ b/Installation/config/support/S65-LEDA5XWIN @@ -1,11 +1,11 @@ # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = Unix +DESCRIPTION = 5.x for Unix PROVIDES = LEDAWIN CXXFLAGS = LDFLAGS = LIBS = W -REQUIRES = X11 LEDAOLD +REQUIRES = X11 LEDA5X INCOMPATIBLE = DOLLAR_WINDOWS_COMPILER STDINCLDIRS = INCLTHING = diff --git a/Installation/config/support/S66-LEDAOLDMS b/Installation/config/support/S66-LEDA5XMS similarity index 82% rename from Installation/config/support/S66-LEDAOLDMS rename to Installation/config/support/S66-LEDA5XMS index bbbd98c2e07..70725187f71 100644 --- a/Installation/config/support/S66-LEDAOLDMS +++ b/Installation/config/support/S66-LEDA5XMS @@ -1,7 +1,7 @@ # Algorithmic Solution's LEDA Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = MS Windows -PROVIDES = LEDAOLD +DESCRIPTION = 5.x for MS Windows +PROVIDES = LEDA5X CXXFLAGS = LDFLAGS = LIBS = P G L diff --git a/Installation/config/support/S67-LEDAOLDWINMS b/Installation/config/support/S67-LEDA5XWINMS similarity index 73% rename from Installation/config/support/S67-LEDAOLDWINMS rename to Installation/config/support/S67-LEDA5XWINMS index 66f603c43e4..f678ea1ea32 100644 --- a/Installation/config/support/S67-LEDAOLDWINMS +++ b/Installation/config/support/S67-LEDA5XWINMS @@ -1,11 +1,11 @@ # Algorithmic Solution's LEDA Window Library (http://www.algorithmic-solutions.com/) -DESCRIPTION = MS Windows +DESCRIPTION = 5.x for MS Windows PROVIDES = LEDAWIN CXXFLAGS = LDFLAGS = LIBS = W -REQUIRES = X11 LEDAOLD DOLLAR_WINDOWS_COMPILER +REQUIRES = X11 LEDA5X DOLLAR_WINDOWS_COMPILER INCOMPATIBLE = STDINCLDIRS = INCLTHING = diff --git a/Installation/config/support/test_LEDA.cpp b/Installation/config/support/test_LEDA.cpp index 6c1bb40aa78..5f0fc5f3dfe 100644 --- a/Installation/config/support/test_LEDA.cpp +++ b/Installation/config/support/test_LEDA.cpp @@ -25,8 +25,14 @@ #include -#include -#include +#ifdef HAVE_LEDA5X + #include + #include +#else + #include + #include +#endif + #if defined(_MSC_VER) || defined(__BORLANDC__) #ifndef LEDA_STD_HEADERS # error "LEDA_STD_HEADERS is not defined. Please consult the troubleshooting section of the installation manual." @@ -37,9 +43,15 @@ using namespace leda; #endif -#include -typedef integer I; -#include +#ifdef HAVE_LEDA5X + #include + typedef integer I; + #include +#else + #include + typedef integer I; + #include +#endif int main() {