diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-04 10:55:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-04 10:55:02 +0000 |
| commit | 2dabe7b23abcc304cefcd1fe8bf03d08e4926466 (patch) | |
| tree | 297f8935c0318696e7a94f431f271ec2fc367e5f /include | |
| parent | 9baa4924752f805dc8ce9e2486ce0fbeceebf28e (diff) | |
| download | ATCD-2dabe7b23abcc304cefcd1fe8bf03d08e4926466.tar.gz | |
ChangeLogTag: Wed Jan 4 10:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'include')
| -rw-r--r-- | include/makeinclude/platform_vxworks5.5.x.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/platform_vxworks6.2.GNU | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU index 279fdcfb368..66d4d205125 100644 --- a/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/include/makeinclude/platform_vxworks5.5.x.GNU @@ -17,7 +17,7 @@ VXWORKS = 1 CROSS-COMPILE = 1 ifneq (,$(HOST_ROOT)) - TAO_IDL ?= $(HOST_ROOT)/bin/tao_idl$(EXEEXT) + TAO_IDL ?= $(HOST_ROOT)/bin/tao_idl.exe TAO_IDL_DEP ?= $(TAO_IDL) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf endif diff --git a/include/makeinclude/platform_vxworks6.2.GNU b/include/makeinclude/platform_vxworks6.2.GNU index 7dfe39f1570..c927cd865e3 100644 --- a/include/makeinclude/platform_vxworks6.2.GNU +++ b/include/makeinclude/platform_vxworks6.2.GNU @@ -86,7 +86,7 @@ ifeq ("$(TOOL)","gnu") templates ?= automatic endif -PRJ_TYPE = vxApp +PRJ_TYPE ?= vxApp ifeq ($(rtp),1) TARGET_DIR = $(WIND_BASE)/target/usr @@ -220,10 +220,12 @@ ifeq ("$(VXWORKSLINK)","true") endif endif else - ace_lib_prelink := 1 - LINK.cc = override - LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH) - LDFLAGS = $(ACE_SHLIBS) + ifeq ($(rtp),0) + ace_lib_prelink := 1 + LINK.cc = override + LINK.cc.override = $(LD_PARTIAL) -frepo -L$(ACE_ROOT)/ace -L$(INSLIB) -L./ $(LDLIBPATH) $(LD_LINK_PATH) + LDFLAGS = $(ACE_SHLIBS) + endif endif else C++FLAGS += -fmerge-templates |