diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-11 13:16:12 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-11 13:16:12 +0000 |
| commit | be431bb9ca455ee83e402aad67ef9409ad02faed (patch) | |
| tree | e2edd51c7a47eeb9298bb73fa36afdb6a1d79437 | |
| parent | c86fd4f9710615419f19e7daf6fa1b640a56d700 (diff) | |
| download | ATCD-be431bb9ca455ee83e402aad67ef9409ad02faed.tar.gz | |
Thu Jun 11 13:15:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_vxworks6.3.GNU:
Use $(HOST_EXE_EXT) when host_root is set
* include/makeinclude/platform_cegcc.GNU:
Set qos to 1 and updated header
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_cegcc.GNU | 6 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_vxworks6.3.GNU | 12 |
3 files changed, 14 insertions, 12 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8d666a5ff78..064cba23d88 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Thu Jun 11 13:15:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_vxworks6.3.GNU: + Use $(HOST_EXE_EXT) when host_root is set + + * include/makeinclude/platform_cegcc.GNU: + Set qos to 1 and updated header + Wed Jun 10 18:18:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-win32-msvc-9.h: diff --git a/ACE/include/makeinclude/platform_cegcc.GNU b/ACE/include/makeinclude/platform_cegcc.GNU index a31252a2eba..2ea29151faf 100644 --- a/ACE/include/makeinclude/platform_cegcc.GNU +++ b/ACE/include/makeinclude/platform_cegcc.GNU @@ -1,8 +1,6 @@ # $Id$ # -# This file should allow to build ACE for cygwin32 with cygwin tools. -# -# Edit to change TCPU and w32api defs below. +# This file should allow to build ACE for Windows CE with GCC tools. # # Don't forget to define the ACE_ROOT environment variable! # @@ -24,6 +22,8 @@ versioned_so=0 ACE_CE_VER ?= 0x600 +qos ?= 1 + # Disable auto-import warnings. The Cygwin linker has a problem with imports # See https://sourceforge.net/tracker/?func=detail&atid=102435&aid=683455&group_id=2435 # for the details why to do this. diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index d33fb808499..3b904fbf2b2 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -69,15 +69,9 @@ endif # x86-win32 ifneq (,$(HOST_ROOT)) TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf -ifeq ("$(WIND_HOST_TYPE)","x86-win32") - TAO_IDL = $(HOST_ROOT)/bin/tao_idl.exe - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2.exe - CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc.exe -else - TAO_IDL = $(HOST_ROOT)/bin/tao_idl - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2 - CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc -endif +TAO_IDL = $(HOST_ROOT)/bin/tao_idl$(HOST_EXE_EXT) +TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/bin/tao_idl3_to_idl2$(HOST_EXE_EXT) +CIDLC = $(HOST_ROOT)/TAO/CIAO/bin/cidlc$(HOST_EXE_EXT) TAO_IDL_DEP = $(TAO_IDL) TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) CIDLC_DEP = $(CIDLC) |