diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-02 11:24:43 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-02 11:24:43 +0000 |
| commit | 3ca95c44e1c38a5c781e43e6a865869628cf24d8 (patch) | |
| tree | 4ebf637bbaa5f8b09d78444b436db75ed12340a5 | |
| parent | 88a2b4ec5c7672f9b52e753770f903f9a687c85e (diff) | |
| download | ATCD-3ca95c44e1c38a5c781e43e6a865869628cf24d8.tar.gz | |
ChangeLogTag: Mon Jan 2 11:23:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 2 | ||||
| -rw-r--r-- | include/makeinclude/platform_vxworks5.5.x.GNU | 12 | ||||
| -rw-r--r-- | include/makeinclude/platform_vxworks6.1.GNU | 18 |
3 files changed, 18 insertions, 14 deletions
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index a60184422e2..138452d094b 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -368,7 +368,7 @@ endif <%endif%> include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ifeq ($(VXWORKSLINK),true) -include $(TGT_DIR)/h/make/rules.$(PRJ_TYPE) +include $(TGT_DIR)/make/rules.$(PRJ_TYPE) endif <%foreach(source_files)%> diff --git a/include/makeinclude/platform_vxworks5.5.x.GNU b/include/makeinclude/platform_vxworks5.5.x.GNU index 9c0375afd82..ce7c28bc049 100644 --- a/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/include/makeinclude/platform_vxworks5.5.x.GNU @@ -85,7 +85,7 @@ ifeq ("$(TOOL)","gnu") endif PRJ_TYPE = vxApp -TGT_DIR = $(WIND_BASE)/target +TGT_DIR = $(WIND_BASE)/target/h ifeq ($(CPU),) # default CPU @@ -139,11 +139,11 @@ ifneq ($(VX_LIB_BUILD),1) endif endif -include $(TGT_DIR)/h/make/defs.default -##include $(TGT_DIR)/h/make/defs.link -include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE) -include $(TGT_DIR)/h/make/defs.$(PRJ_TYPE) -include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) +include $(TGT_DIR)/make/defs.default +##include $(TGT_DIR)/make/defs.link +include $(TGT_DIR)/make/defs.$(WIND_HOST_TYPE) +include $(TGT_DIR)/make/defs.$(PRJ_TYPE) +include $(TGT_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) ## make sure we don't use that stupid, crippled vxrm.bat script. override RM=rm -f diff --git a/include/makeinclude/platform_vxworks6.1.GNU b/include/makeinclude/platform_vxworks6.1.GNU index f786f729115..6f4fa8eddb8 100644 --- a/include/makeinclude/platform_vxworks6.1.GNU +++ b/include/makeinclude/platform_vxworks6.1.GNU @@ -35,7 +35,7 @@ rtti ?= 1 threads ?= 1 exceptions ?= 1 rtp ?= 1 -pthread ?= 0 +pthread ?= 1 ifeq ($(static_libs),1) shared_libs = 0 @@ -87,7 +87,12 @@ ifeq ("$(TOOL)","gnu") endif PRJ_TYPE = vxApp -TGT_DIR = $(WIND_BASE)/target + +ifeq ($(rtp),1) + TGT_DIR = $(WIND_BASE)/target/usr +else + TGT_DIR = $(WIND_BASE)/target/h +endif ifeq ($(CPU),) # default CPU @@ -141,11 +146,10 @@ ifneq ($(VX_LIB_BUILD),1) endif endif -include $(TGT_DIR)/h/make/defs.default -##include $(TGT_DIR)/h/make/defs.link -include $(TGT_DIR)/h/make/defs.$(WIND_HOST_TYPE) -include $(TGT_DIR)/h/make/defs.$(PRJ_TYPE) -include $(TGT_DIR)/h/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) +include $(TGT_DIR)/make/defs.default +include $(TGT_DIR)/make/defs.$(WIND_HOST_TYPE) +include $(TGT_DIR)/make/defs.$(PRJ_TYPE) +include $(TGT_DIR)/tool/$(TOOL_FAMILY)/make.$(CPU)$(TOOL) ## make sure we don't use that stupid, crippled vxrm.bat script. override RM=rm -f |