[openrtm-commit:01354] r2531 - in trunk/OpenRTM-aist/src/lib/coil: build win32 win32/coil
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 15日 (土) 01:43:36 JST
Author: n-ando
Date: 2014-03-15 01:43:36 +0900 (Sat, 15 Mar 2014)
New Revision: 2531
Modified:
trunk/OpenRTM-aist/src/lib/coil/build/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/build/slntool.py
trunk/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py
trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props
trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props
trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops
Log:
[compat,build,->RELENG_1_1] VC project/sln tools and config-files have been updated for 64bit support. refs #3041
Modified: trunk/OpenRTM-aist/src/lib/coil/build/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/build/Makefile.am 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/build/Makefile.am 2014-03-14 16:43:36 UTC (rev 2531)
@@ -13,6 +13,7 @@
autogen \
setuptest.py \
vcprojtool.py \
+ vcxprojtool.py \
makedeffile.py \
slntool.py \
yat.py \
Modified: trunk/OpenRTM-aist/src/lib/coil/build/slntool.py
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/build/slntool.py 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/build/slntool.py 2014-03-14 16:43:36 UTC (rev 2531)
@@ -4,15 +4,14 @@
# @date $Date: 2008-03-06 06:46:37 $
# @author Norkai Ando <n-ando at aist.go.jp>
#
-# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
+# Copyright (C) 2008-2011
+# Noriaki Ando, Tsuyoto Katami
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
# All rights reserved.
#
-# $Id: slntool.py 1863 2010-02-11 06:31:11Z n-ando $
+# $Id: slntool.py 2217 2011-08-22 07:58:52Z fsi-katami $
#
import sys
@@ -25,7 +24,9 @@
#------------------------------------------------------------
vcversions = {"VC8": {"sln": "9.00", "vc": "2005"},
"VC9": {"sln": "10.00", "vc": "2008"},
- "VC10": {"sln": "11.00", "vc": "2010"}
+ "VC10": {"sln": "11.00", "vc": "2010"},
+ "VC11": {"sln": "12.00", "vc": "2012"},
+ "VC12": {"sln": "13.00", "vc": "2013"},
}
sln_template = """Microsoft Visual Studio Solution File, Format Version %s
# Visual Studio %s
@@ -68,7 +69,9 @@
SolutionGUID: 8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942
Configurations:
- Release|Win32
+ - Release|x64
- Debug|Win32
+ - Debug|x64
"""
@@ -78,7 +81,7 @@
slntool.py --dep dep_file [--outfile outfile] vcproj_files...
Options:
- --vcversion: Visual C++'s version [VC8|VC9|VC10]
+ --vcversion: Visual C++'s version [VC8|VC9|VC10|VC11|VC12]
--dep: dependency file
--out or --output: output file name
@@ -105,33 +108,14 @@
"""
-def get_projinfo(fname):
+def get_projinfo(fname,vcversion="VC8"):
name = None
guid = None
- re_guid = re.compile('^.*?ProjectGUID=\"{(.*)}\"')
- re_name = re.compile('^.*?Name=\"(.*)\"')
- fd = open(fname, "r")
- pj = fd.readlines()
- for t in pj:
- n = re_name.match(t)
- g = re_guid.match(t)
-
- if name == None and n:
- name = n.group(1)
- if guid == None and g:
- guid = g.group(1)
-
- if name and guid:
- break
- fd.close()
- return {"Name": name, "GUID": guid, "FileName": fname}
-
-def get_projinfo(fname,vcversion):
- name = None
- guid = None
regexs = {"VC8": {"guid":'^.*?ProjectGUID=\"{(.*)}\"',"name":'^.*?Name=\"(.*)\"'},
"VC9": {"guid":'^.*?ProjectGUID=\"{(.*)}\"',"name":'^.*?Name=\"(.*)\"'},
- "VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'}
+ "VC10": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC11": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
+ "VC12": {"guid":'^.*?<ProjectGuid>{(.*)}</ProjectGuid>',"name":'^.*<ProjectName>(.*)</ProjectName>'},
}
re_guid = re.compile(regexs[vcversion]["guid"])
re_name = re.compile(regexs[vcversion]["name"])
@@ -192,75 +176,12 @@
i += 1
return (vcversion, depfile, outfile, flist)
-def get_slnyaml(depfile, projfiles):
+def get_slnyaml(depfile, projfiles, vcversion="VC8"):
depdict = get_dependencies(depfile)
projs = []
projlist = """Projects:
"""
for f in projfiles:
- pj = get_projinfo(f)
- if depdict.has_key(pj["Name"]):
- pj["Depend"] = depdict[pj["Name"]]
- projs.append(pj)
- def depsort(d0, d1):
- """
- d0 < d1: return -1
- d0 == d1: return 0
- d0 > d1: return 1
- """
- d0_depends = d0.has_key("Depend")
- d1_depends = d1.has_key("Depend")
- if not d0_depends and not d1_depends:
- # both d0, d1 has no dependency
- return 0
-
- if not d0_depends and d1_depends:
- # only "d1" has dependency: d0 < d1
- return -1
-
- if d0_depends and not d1_depends:
- # only "d0" has dependency: d1 < d0
- return 1
-
- # d0 and d1 has dependency
- d0_in_dep = depdict.has_key(d0["Name"])
- d1_in_dep = depdict.has_key(d1["Name"])
- if not d0_in_dep and not d1_in_dep:
- return 0
- if not d0_in_dep and d1_in_dep:
- return -1
- if d0_in_dep and not d1_in_dep:
- return 1
-
- # both d0 and d1 have several dependency
- if depdict[d0["Name"]].count(d1["Name"]) > 0:
- return 1
- if depdict[d1["Name"]].count(d0["Name"]) > 0:
- return -1
- return 0
-
- projs.sort(depsort)
- for pj in projs:
- list = """ - Name: %s
- FileName: %s
- GUID: &%s %s
- Depend:
-""" % (pj["Name"], pj["FileName"], pj["Name"], pj["GUID"])
- if pj.has_key("Depend"):
- for dep in pj["Depend"]:
- dep = """ - *%s
-""" % (dep)
- list += dep
- projlist += list
- yaml_text = sln_yaml + projlist
- return yaml_text
-
-def get_slnyaml(depfile, projfiles, vcversion):
- depdict = get_dependencies(depfile)
- projs = []
- projlist = """Projects:
-"""
- for f in projfiles:
pj = get_projinfo(f, vcversion)
if depdict.has_key(pj["Name"]):
pj["Depend"] = depdict[pj["Name"]]
Modified: trunk/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py 2014-03-14 16:43:36 UTC (rev 2531)
@@ -5,8 +5,7 @@
# @author Norkai Ando <n-ando at aist.go.jp>
#
# Copyright (C) 2008
-# Noriaki Ando
-# Task-intelligence Research Group,
+# Tsuyoto Katami, Noriaki Ando
# Intelligent Systems Research Institute,
# National Institute of
# Advanced Industrial Science and Technology (AIST), Japan
@@ -25,10 +24,18 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>[RootNamespace]</ProjectName>
@@ -142,7 +149,7 @@
# Tool set for configuration
#------------------------------------------------------------
PreBuildEventtools = {"EXE":
- ["PreBuildEvent",
+ ["VC10_VCPreBuildEventTool",
"VCCustomBuildTool",
"VCXMLDataGeneratorTool",
"VCWebServiceProxyGeneratorTool",
@@ -151,9 +158,9 @@
"VCResourceCompilerTool",
"VCManifestTool"],
"DLL":
- ["PreBuildEvent"],
+ ["VC10_VCPreBuildEventTool"],
"LIB":
- ["PreBuildEvent"]
+ ["VC10_VCPreBuildEventTool"]
}
PreBuildEventtools["RTCEXE"] = PreBuildEventtools["EXE"]
PreBuildEventtools["RTCDLL"] = PreBuildEventtools["DLL"]
@@ -229,16 +236,7 @@
Linktools["RTCEXE"] = Linktools["EXE"]
Linktools["RTCDLL"] = Linktools["DLL"]
PostBuildEventtools = {"EXE":
- ["VC10_VCPreLinkEventTool",
- "VC10_VCLinkerTool",
- "VCALinkTool",
- "VCManifestTool",
- "VCXDCMakeTool",
- "VCBscMakeTool",
- "VCFxCopTool",
- "VCAppVerifierTool",
- "VCWebDeploymentTool",
- "VC10_VCPostBuildEventTool"],
+ ["VC10_VCPostBuildEventTool"],
"DLL":
["VC10_VCPostBuildEventTool"],
"LIB":
@@ -420,6 +418,7 @@
# VCWebDeploymentTool:
# VC10_VCPostBuildEventTool:
"""
+exe_yaml = exe_yaml + "\n" + exe_yaml.replace("Win32", "x64")
dll_yaml = """ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -566,6 +565,8 @@
copy "$(OutDir)\\\\$(TargetName).lib" "$(SolutionDir)bin\\\\"
copy "$(OutDir)\\\\$(TargetName).dll" "$(SolutionDir)bin\\\\"
"""
+dll_yaml = dll_yaml + "\n" + dll_yaml.replace("Win32", "x64")
+
#------------------------------------------------------------
lib_yaml = """ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -673,8 +674,8 @@
Value: |
copy "$(OutDir)\\\\libRTCSkel.lib" "$(SolutionDir)\\\\bin"
"""
+lib_yaml = lib_yaml + "\n" + lib_yaml.replace("Win32", "x64")
-
rtcexe_yaml="""ProjectType: "Visual C++"
Version: "__VCVERSION__"
Name: __PROJECT_NAME__
@@ -790,6 +791,7 @@
- Key: TargetMachine
Value: "MachineX86"
"""
+rtcexe_yaml = rtcexe_yaml + "\n" + rtcexe_yaml.replace("Win32", "x64")
rtcdll_yaml="""ProjectType: "Visual C++"
Version: "__VCVERSION__"
@@ -911,7 +913,6 @@
"""
-
def usage():
print """Usage:
vcprojtool.py cmd options
@@ -929,6 +930,7 @@
vcprojtool.py yaml --type [exe|dll|nmake|lib] --output
vcprojtool.py flist --out --source|--header|--resource *
"""
+rtcdll_yaml = rtcdll_yaml + "\n" + rtcdll_yaml.replace("Win32", "x64")
import sys
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2014-03-14 16:43:36 UTC (rev 2531)
@@ -20,14 +20,16 @@
coil_distbuild.props \
coil_vc8.sln \
coil_vc9.sln \
- coil_vc10.sln
+ coil_vc10.sln \
+ coil_vc11.sln \
+ coil_vc12.sln
#------------------------------------------------------------
# sln file build rules
#------------------------------------------------------------
win32_builddir = .
-sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln
+sln: coil_vc8.sln coil_vc9.sln coil_vc10.sln coil_vc11.sln coil_vc12.sln
vcproj:
(cd coil ; make vcproj)
@@ -57,3 +59,19 @@
`find ./ -name '*_vc10.vcxproj'`
qkc -ms coil_vc10.sln
+coil_vc11.sln: coil.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC11 \
+ --dep coil.sln.dep \
+ --out coil_vc11.sln \
+ `find ./ -name '*_vc11.vcxproj'`
+ qkc -ms coil_vc11.sln
+
+coil_vc12.sln: coil.sln.dep vcproj
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC12 \
+ --dep coil.sln.dep \
+ --out coil_vc12.sln \
+ `find ./ -name '*_vc12.vcxproj'`
+ qkc -ms coil_vc12.sln
+
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2014-03-14 16:43:36 UTC (rev 2531)
@@ -101,7 +101,7 @@
#------------------------------------------------------------
win32_builddir = .
-vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj
+vcproj: libcoil_vc8.vcproj libcoil_vc9.vcproj libcoil_vc10.vcxproj libcoil_vc11.vcxproj libcoil_vc12.vcxproj
libcoil_vc8.vcproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -136,6 +136,28 @@
--header $(COIL_H)
qkc -sm $(win32_builddir)/libcoil_vc10.vcxproj
+libcoil_vc11.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "11.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc11.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H)
+ qkc -sm $(win32_builddir)/libcoil_vc11.vcxproj
+
+libcoil_vc12.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "12.00" \
+ --version $(COIL_VERSION) \
+ --out $(win32_builddir)/libcoil_vc12.vcxproj \
+ --yaml libcoil.vcproj.yaml \
+ --source $(COIL_SRC) \
+ --header $(COIL_H)
+ qkc -sm $(win32_builddir)/libcoil_vc12.vcxproj
+
#------------------------------------------------------------
# for wxs file
#------------------------------------------------------------
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-03-14 16:43:36 UTC (rev 2531)
@@ -119,6 +119,112 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver)d.lib"
copy "$(OutDir)\\coil$(coil_dllver)d.dll" "$(SolutionDir)bin\\"
+ - Name: "Debug|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)coil_config.vsprops;$(SolutionDir)coil_distbuild.vsprops"
+ CharacterSet: "0"
+ VCCLCompilerTool:
+ - Key: Optimization
+ Value: "0"
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "3"
+ - Key: RuntimeLibrary
+ Value: "3"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "4"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ move coil$(coil_dllver)d.def ..\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_libd)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
+ - Key: Version
+ Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "2"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)coil_distbuild.props"
+ - "$(SolutionDir)coil_config.props"
+ VC10_LinkIncrementalCondition: "true"
+ VC10_VCCLCompilerTool:
+ - Key: Optimization
+ Value: "Disabled"
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;_DEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: MinimalRebuild
+ Value: "true"
+ - Key: BasicRuntimeChecks
+ Value: "EnableFastChecks"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDebugDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "EditAndContinue"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(TargetDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ move coil$(coil_dllver)d.def ..\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_libd);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver)d.dll"
+ - Key: Version
+ Value: __VERSION__
+ - Key: LinkIncremental
+ Value: "true"
+ - Key: ModuleDefinitionFile
+ Value: "coil$(coil_dllver)d.def"
+ - Key: GenerateDebugInformation
+ Value: "true"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver)d.lib"
+ copy "$(OutDir)\\coil$(coil_dllver)d.dll" "$(SolutionDir)bin\\"
#------------------------------------------------------------
# Release Configuration
#------------------------------------------------------------
@@ -222,3 +328,103 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver).lib"
copy "$(OutDir)\\coil$(coil_dllver).dll" "$(SolutionDir)bin\\"
+ - Name: "Release|x64"
+ OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
+ ConfigurationType: "2"
+ InheritedPropertySheets: "$(SolutionDir)coil_config.vsprops;$(SolutionDir)coil_distbuild.vsprops"
+ CharacterSet: "0"
+ WholeProgramOptimization: "0"
+ VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
+ - Key: RuntimeLibrary
+ Value: "2"
+ - Key: UsePrecompiledHeader
+ Value: "0"
+ - Key: WarningLevel
+ Value: "3"
+ - Key: DebugInformationFormat
+ Value: "3"
+ VCPreLinkEventTool:
+ - Key: CommandLine
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_version) $(TargetName).def
+ move coil$(coil_dllver).def ..\\
+ VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_lib)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver).dll"
+ - Key: LinkIncremental
+ Value: "1"
+ - Key: ModuleDefinitionFile
+ Value: "$(TargetName).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "2"
+ - Key: OptimizeReferences
+ Value: "2"
+ - Key: EnableCOMDATFolding
+ Value: "2"
+ - Key: TargetMachine
+ Value: "1"
+ VCPostBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
+ copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
+
+ VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_InheritedPropertySheets:
+ - "$(SolutionDir)coil_distbuild.props"
+ - "$(SolutionDir)coil_config.props"
+ VC10_LinkIncrementalCondition: "false"
+ VC10_VCCLCompilerTool:
+ - Key: PreprocessorDefinitions
+ Value: "WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
+ - Key: RuntimeLibrary
+ Value: "MultiThreadedDLL"
+ - Key: PrecompiledHeader
+ Value: "NotUsing"
+ - Key: WarningLevel
+ Value: "Level3"
+ - Key: DebugInformationFormat
+ Value: "ProgramDatabase"
+ VC10_VCPreLinkEventTool:
+ - Key: Command
+ Value: |
+ lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
+ set PATH=%PATH%;$(coil_path)
+ cd "$(OutDir)"
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_version) coil$(coil_dllver).def
+ move coil$(coil_dllver).def ..\\
+ VC10_VCLinkerTool:
+ - Key: AdditionalDependencies
+ Value: "$(coil_depend_lib);%(AdditionalDependencies)"
+ - Key: OutputFile
+ Value: "$(OutDir)\\coil$(coil_dllver).dll"
+ - Key: LinkIncremental
+ Value: "false"
+ - Key: ModuleDefinitionFile
+ Value: "coil$(coil_dllver).def"
+ - Key: GenerateDebugInformation
+ Value: "false"
+ - Key: SubSystem
+ Value: "Windows"
+ - Key: OptimizeReferences
+ Value: "true"
+ - Key: EnableCOMDATFolding
+ Value: "true"
+ - Key: TargetMachine
+ Value: "MachineX64"
+ VC10_VCPostBuildEventTool:
+ - Key: Command
+ Value: |
+ copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\coil$(coil_dllver).lib"
+ copy "$(OutDir)\\coil$(coil_dllver).dll" "$(SolutionDir)bin\\"
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-03-14 16:43:36 UTC (rev 2531)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <coil_dllver>$(COIL_DLL_VER)</coil_dllver>
+ <coil_dllver>$(COIL_DLLVER)</coil_dllver>
<coil_version>$(COIL_VERSION)</coil_version>
<coil_includes>$(coil_root);..</coil_includes>
<coil_libdir>$(coil_root)\bin</coil_libdir>
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-03-14 16:43:36 UTC (rev 2531)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="coil-%COIL_SHORT_VER%"
+ Name="coil-%COIL_SHORTVER%"
>
<Tool
Name="VCCLCompilerTool"
@@ -18,7 +18,7 @@
/>
<UserMacro
Name="coil_dllver"
- Value="%COIL_DLL_VER%"
+ Value="%COIL_DLLVER%"
/>
<UserMacro
Name="coil_version"
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props 2014-03-14 16:43:36 UTC (rev 2531)
@@ -7,7 +7,7 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>coil-dist-$(COIL_SHORT_VER)</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>coil-dist-$(COIL_SHORTVER)</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="coil_root">
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops 2014-03-14 16:43:36 UTC (rev 2531)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="coil-dist-%COIL_SHORT_VER%"
+ Name="coil-dist-%COIL_SHORTVER%"
>
<UserMacro
Name="coil_root"
More information about the openrtm-commit
mailing list