diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-20 12:11:28 +0000 |
| commit | 1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5 (patch) | |
| tree | 78fc0571a66bb48c5b2565e10ceef69cfe5afff2 /ACE/include/makeinclude/platform_linux_common.GNU | |
| parent | 6f8f4ebd99e45fe3e24a40c6cc7cf03bf8d31c24 (diff) | |
| download | ATCD-1ff84a46c62fb482bd62a384b34f4b9c1e7e2ca5.tar.gz | |
Merged RemedyWork branch.
ChangeLogTag: Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl>
Diffstat (limited to 'ACE/include/makeinclude/platform_linux_common.GNU')
| -rw-r--r-- | ACE/include/makeinclude/platform_linux_common.GNU | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index a4c693ad1b6..6c18e52bb16 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -45,24 +45,25 @@ PLATFORM_BOOST_CPPFLAGS ?= PLATFORM_BOOST_LDLAGS ?= PLATFORM_BOOST_UTF_LIBS ?= -lboost_unit_test_framework -ifeq (Ubuntu, $(findstring Ubuntu,$(LSB_RELEASE_ID))) - PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) - PLATFORM_TK_LIBS=$(shell . /usr/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) - PLATFORM_TK_LDFLAGS= - - PLATFORM_TCL_CPPFLAGS= - PLATFORM_TCL_LIBS=-ltcl8.4 - PLATFORM_TCL_LDFLAGS= -else - PLATFORM_TK_CPPFLAGS=-I$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_INC_DIR $$TK_DEFS) - PLATFORM_TK_LIBS=$(shell . /usr/lib*/tkConfig.sh && echo -n $$TK_LIB_FLAG) - PLATFORM_TK_LDFLAGS= - - - PLATFORM_TCL_CPPFLAGS= - PLATFORM_TCL_LIBS=-ltcl - PLATFORM_TCL_LDFLAGS= +ifeq ($(buildbits),32) +PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib/tkConfig.sh && echo -n $$TK_LIB_FLAG) endif +ifeq ($(buildbits),64) +PLATFORM_TK_CPPFLAGS=$(shell . /usr/lib64/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC $$TK_DEFS) +PLATFORM_TK_LIBS=$(shell . /usr/lib64/tkConfig.sh && echo -n $$TK_LIB_FLAG) +endif +PLATFORM_TK_LDFLAGS= + +ifeq ($(buildbits),32) +PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS) +PLATFORM_TCL_LIBS=$(shell . /usr/lib/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG)) +endif +ifeq ($(buildbits),64) +PLATFORM_TCL_CPPFLAGS=$(shell . /usr/lib64/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC $$TCL_DEFS) +PLATFORM_TCL_LIBS=$(shell . /usr/lib64/tclConfig.sh && echo -n $$(eval echo $$TCL_LIB_FLAG)) +endif +PLATFORM_TCL_LDFLAGS= PLATFORM_QT_CPPFLAGS ?= -I$(QTDIR)/include PLATFORM_QT_LIBS ?= -lqt-mt |