diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-23 13:56:05 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-01-23 13:56:05 +0000 |
| commit | 2b99d3e92bb01246c3b871c7908a89943fcebb53 (patch) | |
| tree | db62dd3c6ae4db020bfd44faad63a68adb9d0ed9 | |
| parent | b5011ceb4e87754f321b298cccf6d1f5d53059e3 (diff) | |
| download | ATCD-2b99d3e92bb01246c3b871c7908a89943fcebb53.tar.gz | |
ChangeLogTag: Sun Jan 23 13:50:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | include/makeinclude/platform_vxworks5.5.x.GNU | 25 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 11 |
2 files changed, 10 insertions, 26 deletions
diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU index 2ba776c9573..53a0b8da1e0 100644 --- a/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/include/makeinclude/platform_vxworks5.5.x.GNU @@ -19,22 +19,11 @@ ifeq ("$(OS)", "Windows_NT") vxworks_ntbuild = 1 endif -ifndef debug - debug = 1 -endif # ! debug -ifndef optimize - optimize = 1 -endif # ! optimize -ifndef rtti - rtti = 1 -endif # ! rtti -ifndef threads - threads = 1 -endif - -ifndef exceptions - exceptions = 0 -endif +debug ?= 1 +optimize ?= 1 +rtti ?= 1 +threads ?= 1 +exceptions ?= 0 shared_libs = static_libs = 1 @@ -77,9 +66,7 @@ endif override TOOL_FAMILY := $(TOOL) ifeq ("$(TOOL)","gnu") -ifndef templates - templates = automatic -endif # ! templates + templates ?= automatic endif PRJ_TYPE = vxApp diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index bba2a928b83..6818cb29ddc 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -286,20 +286,17 @@ ifeq ($(threads),0) endif # threads #### -#### Defaults are exceptions off (0), fast off (0), rtti off (0), and +#### Defaults are exceptions off (0), fast off (0), rtti on (1), and #### versioned_so on (1). #### exceptions ?= 0 fast ?= 0 -# @@@ Should this really be the default? Or should we let the -# compiler choose? -rtti ?= 0 +rtti ?= 1 + +versioned_so ?= 1 -ifeq (,$(versioned_so)) - versioned_so = 1 -endif SOVERSION ?= SONAME ?= |