diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
| -rw-r--r-- | include/makeinclude/platform_linux_borland.GNU | 15 |
3 files changed, 24 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 098d5ea76ed..b4b11f134e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ Sun Jan 26 16:42:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_linux_borland.GNU: + When AIO support is found, set the right define but also add the + library liblrt to the lists to link with. Only when building with + threading support link with the pthread library. + +Sun Jan 26 16:42:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux_borland.GNU: Don't set any BUILD_DLL defines in this file, the BUILD_DLL defines are set in the specific makefiles. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 098d5ea76ed..b4b11f134e5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,6 +1,13 @@ Sun Jan 26 16:42:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_linux_borland.GNU: + When AIO support is found, set the right define but also add the + library liblrt to the lists to link with. Only when building with + threading support link with the pthread library. + +Sun Jan 26 16:42:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_linux_borland.GNU: Don't set any BUILD_DLL defines in this file, the BUILD_DLL defines are set in the specific makefiles. diff --git a/include/makeinclude/platform_linux_borland.GNU b/include/makeinclude/platform_linux_borland.GNU index e7757e50e7c..9515d5a2c38 100644 --- a/include/makeinclude/platform_linux_borland.GNU +++ b/include/makeinclude/platform_linux_borland.GNU @@ -23,8 +23,17 @@ ifeq (,$(threads)) threads = 1 endif +PLATFORM_AIO_SUPPORT := \ + $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) + ifeq ($(threads),0) CPPFLAGS += -DACE_MT_SAFE=0 +else + LIBS += libpthread + ifeq (-DACE_HAS_AIO_CALLS,$(PLATFORM_AIO_SUPPORT)) + CPPFLAGS += -DACE_HAS_AIO_CALLS + LIBS += liblrt + endif endif # threads PLATFORM_XT_CPPFLAGS= @@ -51,9 +60,6 @@ PLATFORM_WX_CPPFLAGS= $(shell wx-config --cflags) $(PLATFORM_GTK_CPPFLAGS) PLATFORM_WX_LIBS = $(shell wx-config --libs) $(PLATFORM_GTK_LIBS) PLATFORM_WX_LDFLAGS = -PLATFORM_AIO_SUPPORT := \ - $(shell test -e /usr/lib/librt.so && echo -DACE_HAS_AIO_CALLS) - ifeq ($(insure),1) CC = insure CXX = insure @@ -98,8 +104,7 @@ CPPFLAGS += #$(CFLAGS) CCFLAGS += $(CFLAGS) BORLDFLAGS = -c -L$(LIBPATH):$(ACELIBPATH) -x -Gn -v -L$(LIBPATH):$(ACELIBPATH) BORINITOBJ = borinitso.o borinit.o crt1.o -BORSHAREDOBJ += libborcrtl.so libborstl.so libborunwind.so \ - libpthread.so libc.so libm.so libdl.so +BORSHAREDOBJ += libborcrtl.so libborstl.so libborunwind.so libc.so libm.so libdl.so PRELINK= SOFLAGS= $(BORSHAREDOBJ) borinitso.o -Tpd |