[openrtm-commit:03313] r3279 - in trunk/OpenRTM-aist: build src/lib/coil/posix/coil src/lib/coil/win32/coil src/lib/rtm win32/OpenRTM-aist win32/OpenRTM-aist/ext/sdo/observer
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 28日 (水) 14:16:12 JST
Author: miyamoto
Date: 2018-03-28 14:16:12 +0900 (Wed, 28 Mar 2018)
New Revision: 3279
Modified:
trunk/OpenRTM-aist/build/cmakeconfgen.py
trunk/OpenRTM-aist/src/lib/coil/posix/coil/File.h
trunk/OpenRTM-aist/src/lib/coil/win32/coil/Affinity.cpp
trunk/OpenRTM-aist/src/lib/coil/win32/coil/File.h
trunk/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp
trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h
trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[merge] r3244-3258 have been merged from RELENG_1_2.
Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py 2018-03-28 05:16:12 UTC (rev 3279)
@@ -192,6 +192,7 @@
"OMNI_SHORTVER",
"OMNITHREAD_DLLVER",
"OMNITHREAD_VERSION",
+ "OMNISSL_DLLVER",
]
for env_str in envs:
env_var = "%" + env_str + "%"
Modified: trunk/OpenRTM-aist/src/lib/coil/posix/coil/File.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/coil/posix/coil/File.h 2018-03-28 05:16:12 UTC (rev 3279)
@@ -24,6 +24,10 @@
#include <dirent.h>
#include <libgen.h>
+#include <string.h>
+#include <sys/stat.h>
+
+
#include <coil/config_coil.h>
#include <coil/stringutil.h>
@@ -189,6 +193,110 @@
return flist;
}
+
+
+ /*!
+ * @if jp
+ *
+ * @brief »ØÄê¥Õ¥¡¥¤¥ë̾¤ò»ØÄê¥Ç¥£¥ì¥¯¥È¥ê¤«¤éõºº¤¹¤ë
+ *
+ * @param dir ¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹
+ * @param filename ¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹
+ * @param filelist ¥Õ¥¡¥¤¥ë°ìÍ÷
+ *
+ *
+ * @else
+ *
+ * @brief
+ *
+ * @param dir
+ * @param filename
+ * @param filelist
+ *
+ * @endif
+ */
+ inline void findFile(std::string dir, std::string filename, coil::vstring &filelist)
+ {
+ struct dirent **namelist=NULL;
+ int files = scandir(dir.c_str(), &namelist, NULL, NULL);
+
+ for (int i=0; i<files; i++) {
+ std::string dname = namelist[i]->d_name;
+ if( dname != "." && dname != ".." ){
+
+ std::string fullpath = dir + "/" + dname;
+
+ struct stat stat_buf;
+ if(stat(fullpath.c_str(), &stat_buf) == 0){
+ if ((stat_buf.st_mode & S_IFMT) == S_IFDIR){
+ findFile(fullpath, filename, filelist);
+ }
+ else
+ {
+ if(dname == filename)
+ {
+ filelist.push_back(fullpath);
+ }
+ }
+ }
+
+
+ }
+ }
+ }
+
+
+ /*!
+ * @if jp
+ *
+ * @brief ¥Õ¥¡¥¤¥ë°ìÍ÷¤ò»ØÄê¥Ç¥£¥ì¥¯¥È¥ê¤«¤éõºº¤¹¤ë
+ *
+ * @param dir ¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹
+ * @param ext ³ÈÄ¥»Ò
+ * @param filelist ¥Õ¥¡¥¤¥ë°ìÍ÷
+ *
+ *
+ * @else
+ *
+ * @brief
+ *
+ * @param dir
+ * @param ext
+ * @param filelist
+ *
+ * @endif
+ */
+ inline void getFileList(std::string dir, std::string ext, coil::vstring &filelist)
+ {
+ struct dirent **namelist=NULL;
+ int files = scandir(dir.c_str(), &namelist, NULL, NULL);
+
+ for (int i=0; i<files; i++) {
+ std::string dname = namelist[i]->d_name;
+ if( dname != "." && dname != ".." ){
+
+ std::string fullpath = dir + "/" + dname;
+
+ struct stat stat_buf;
+ if(stat(fullpath.c_str(), &stat_buf) == 0){
+ if ((stat_buf.st_mode & S_IFMT) == S_IFDIR){
+ getFileList(fullpath, ext, filelist);
+ }
+ else
+ {
+ coil::vstring filesp = coil::split(dname, ".");
+ if(filesp.back() == ext)
+ {
+ filelist.push_back(fullpath);
+ }
+ }
+ }
+
+
+ }
+ }
+
+ }
};
#endif // COIL_FILE_H
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Affinity.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Affinity.cpp 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Affinity.cpp 2018-03-28 05:16:12 UTC (rev 3279)
@@ -36,7 +36,7 @@
DWORD cpu_num = listToCUPNUM(cpu_mask);
DWORD processMask, systemMask = 0;
HANDLE h = GetCurrentProcess();
- BOOL success = GetProcessAffinityMask(h, &processMask, &systemMask);
+ BOOL success = GetProcessAffinityMask(h, (PDWORD_PTR)&processMask, (PDWORD_PTR)&systemMask);
if (success)
{
for (int i = 0; i < 32; i++)
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/File.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/File.h 2018-03-28 05:16:12 UTC (rev 3279)
@@ -20,6 +20,7 @@
#define COIL_FILE_H
#include <windows.h>
+#include <fstream>
#include <coil/config_coil.h>
#include <coil/stringutil.h>
@@ -446,7 +447,134 @@
return flist;
}
+ /*!
+ * @if jp
+ *
+ * @brief Žw’èƒtƒ@ƒCƒ‹–¼‚ðŽw’èƒfƒBƒŒƒNƒgƒŠ‚©‚ç’T¸‚·‚é
+ *
+ * @param dir ƒfƒBƒŒƒNƒgƒŠƒpƒX
+ * @param filename ƒfƒBƒŒƒNƒgƒŠƒpƒX
+ * @param filelist ƒtƒ@ƒCƒ‹ˆê——
+ *
+ *
+ * @else
+ *
+ * @brief
+ *
+ * @param dir
+ * @param filename
+ * @param filelist
+ *
+ * @endif
+ */
+ inline void findFile(std::string dir, std::string filename, coil::vstring &filelist)
+ {
+ {
+ HANDLE hFind;
+ WIN32_FIND_DATA win32fd;
+ std::string dir_fff = dir + "\\*";
+ hFind = FindFirstFile(dir_fff.c_str(), &win32fd);
+ if (hFind == INVALID_HANDLE_VALUE) {
+ return;
+ }
+ do {
+ if (win32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ std::string filename = win32fd.cFileName;
+ if (filename != "." && filename != "..")
+ {
+ std::string next_dir = dir + "\\" + win32fd.cFileName;
+ findFile(next_dir, filename, filelist);
+ }
+ }
+ else {
+ }
+ } while (FindNextFile(hFind, &win32fd));
+ }
+
+ {
+ std::string file_fff = dir + "\\" + filename;
+ std::ifstream ifs(file_fff);
+
+ if (ifs.is_open())
+ {
+ filelist.push_back(file_fff);
+ }
+
+ }
+ }
+
+
+
+ /*!
+ * @if jp
+ *
+ * @brief ƒtƒ@ƒCƒ‹ˆê——‚ðŽw’èƒfƒBƒŒƒNƒgƒŠ‚©‚ç’T¸‚·‚é
+ *
+ * @param dir ƒfƒBƒŒƒNƒgƒŠƒpƒX
+ * @param ext Šg’£Žq
+ * @param filelist ƒtƒ@ƒCƒ‹ˆê——
+ *
+ *
+ * @else
+ *
+ * @brief
+ *
+ * @param dir
+ * @param ext
+ * @param filelist
+ *
+ * @endif
+ */
+ inline void getFileList(std::string dir, std::string ext, coil::vstring &filelist)
+ {
+ {
+ HANDLE hFind;
+ WIN32_FIND_DATA win32fd;
+ std::string dir_fff = dir + "\\*";
+ hFind = FindFirstFile(dir_fff.c_str(), &win32fd);
+
+ if (hFind == INVALID_HANDLE_VALUE) {
+ return;
+ }
+ do {
+ if (win32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ std::string filename = win32fd.cFileName;
+ //std::cout << win32fd.cFileName << std::endl;
+ if (filename != "." && filename != "..")
+ {
+ std::string next_dir = dir + "\\" + win32fd.cFileName;
+ getFileList(next_dir, ext, filelist);
+ }
+ }
+ else {
+ }
+ } while (FindNextFile(hFind, &win32fd));
+ }
+
+ {
+ HANDLE hFind;
+ WIN32_FIND_DATA win32fd;
+ std::string file_fff = dir + "\\*." + ext;
+ hFind = FindFirstFile(file_fff.c_str(), &win32fd);
+ if (hFind == INVALID_HANDLE_VALUE) {
+ return;
+ }
+ do {
+ if (win32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+
+ }
+ else {
+ std::string ret = dir + "\\" + win32fd.cFileName;
+ filelist.push_back(ret);
+ }
+ } while (FindNextFile(hFind, &win32fd));
+ }
+
+
+ }
+
+
};
#endif // COIL_FILE_H
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Process.cpp 2018-03-28 05:16:12 UTC (rev 3279)
@@ -31,6 +31,8 @@
*/
int launch_shell(std::string command)
{
+ std::string cmd = "cmd.exe /c ";
+ command = cmd + command;
#ifdef UNICODE
// std::string -> LPTSTR
std::wstring wcommand = string2wstring(command);
Modified: trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/rtm/CorbaPort.h 2018-03-28 05:16:12 UTC (rev 3279)
@@ -1227,7 +1227,8 @@
{
#ifndef ORB_IS_RTORB
#ifdef ORB_IS_OMNIORB
- m_poa = ::RTC::Manager::instance().theShortCutPOA();
+ m_poa = ::RTC::Manager::instance().getShortCutPOA();
+ m_poa->activate_object(m_servant);
#else
m_poa = ::RTC::Manager::instance().getPOA();
#endif
Modified: trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/rtm/DefaultConfiguration.h 2018-03-28 05:16:12 UTC (rev 3279)
@@ -88,6 +88,7 @@
"manager.components.naming_policy", "process_unique",
"manager.command", "rtcd",
"manager.nameservers", "default",
+ "manager.language", "C++",
"manager.supported_languages", "C++, Python, Java",
"manager.modules.C++.manager_cmd", "rtcd",
"manager.modules.C++.profile_cmd", "rtcprof",
@@ -100,15 +101,15 @@
"manager.modules.C++.suffixes", "so",
#endif
#endif
- "manager.modules.C++.load_paths", "./",
+ "manager.modules.C++.load_paths", "",
"manager.modules.Python.manager_cmd", "rtcd_python",
"manager.modules.Python.profile_cmd", "rtcprof_python",
"manager.modules.Python.suffixes", "py",
- "manager.modules.Python.load_paths", "./",
+ "manager.modules.Python.load_paths", "",
"manager.modules.Java.manager_cmd", "rtcd_java",
"manager.modules.Java.profile_cmd", "rtcprof_java",
"manager.modules.Java.suffixes", "class",
- "manager.modules.Java.load_paths", "./",
+ "manager.modules.Java.load_paths", "",
"manager.modules.search_auto", "YES",
"manager.local_service.enabled_services","ALL",
"sdo.service.provider.enabled_services", "ALL",
Modified: trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerServant.cpp 2018-03-28 05:16:12 UTC (rev 3279)
@@ -1207,8 +1207,11 @@
return RTC::RTObject::_nil();
}
+
+ CompParam comp_param(create_arg);
+
// detect languange
- std::string lang = param["language"];
+ std::string lang = comp_param.language();
if (lang.empty()) { lang = "C++"; }
RTC_INFO(("Specified manager's language: %s", lang.c_str()));
@@ -1219,7 +1222,7 @@
RTC_INFO(("Creating new manager named %s", mgrstr.c_str()));
std::string rtcd_cmd_key("manager.modules.");
- rtcd_cmd_key += lang + "manager_cmd";
+ rtcd_cmd_key += lang + ".manager_cmd";
coil::Properties& prop = m_mgr.getConfig();
std::string rtcd_cmd = prop[rtcd_cmd_key];
@@ -1307,29 +1310,29 @@
}
}
- if (CORBA::is_nil(mgrobj))
- {
- RTC_ERROR(("Launch failed: manager (%s)", mgrstr.c_str()));
- return RTC::RTObject::_nil();
- }
- std::string create_arg_str(create_arg);
- getParameterByModulename("manager_name", create_arg_str);
- RTC_DEBUG(("Creating component on %s", mgrstr.c_str()));
- RTC_DEBUG(("arg: %s", create_arg_str.c_str()));
- try
- {
- return mgrobj->create_component(create_arg_str.c_str());
- }
- catch (CORBA::SystemException& e)
- {
- RTC_ERROR(("Exception was caught while creating component."));
- return RTC::RTObject::_nil();
- }
- catch (...)
- {
- RTC_ERROR(("Unknown non-CORBA exception cought."));
- return RTC::RTObject::_nil();
- }
+ if (CORBA::is_nil(mgrobj))
+ {
+ RTC_ERROR(("Launch failed: manager (%s)", mgrstr.c_str()));
+ return RTC::RTObject::_nil();
+ }
+ std::string create_arg_str(create_arg);
+ getParameterByModulename("manager_name", create_arg_str);
+ RTC_DEBUG(("Creating component on %s", mgrstr.c_str()));
+ RTC_DEBUG(("arg: %s", create_arg_str.c_str()));
+ try
+ {
+ return mgrobj->create_component(create_arg_str.c_str());
+ }
+ catch (CORBA::SystemException& e)
+ {
+ RTC_ERROR(("Exception was caught while creating component."));
+ return RTC::RTObject::_nil();
+ }
+ catch (...)
+ {
+ RTC_ERROR(("Unknown non-CORBA exception cought."));
+ return RTC::RTObject::_nil();
+ }
return RTC::RTObject::_nil();
}
@@ -1366,8 +1369,10 @@
return RTC::RTObject::_nil();
}
+
+ CompParam comp_param(create_arg);
// detect languange
- std::string lang = param["language"];
+ std::string lang = comp_param.language();
if (lang.empty()) { lang = "C++"; }
RTC_INFO(("Specified manager's language: %s", lang.c_str()));
Modified: trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/src/lib/rtm/ModuleManager.cpp 2018-03-28 05:16:12 UTC (rev 3279)
@@ -374,9 +374,16 @@
{
return f;
}
+ coil::vstring ret;
+ coil::findFile((*it), file_name, ret);
+ if (!ret.empty())
+ {
+ return ret.front();
+ }
+
++it;
}
-
+
return std::string("");
}
@@ -479,8 +486,10 @@
coil::vstring flist;
for (size_t s(0); s < suffixes.size(); ++s)
{
- std::string glob("*."); glob += suffixes[s];
- coil::vstring tmp = coil::filelist(path.c_str(), glob.c_str());
+ //std::string glob("*."); glob += suffixes[s];
+ //coil::vstring tmp = coil::filelist(path.c_str(), glob.c_str());
+ coil::vstring tmp;
+ coil::getFileList(path, suffixes[s], tmp);
RTC_DEBUG(("File list (path:%s, ext:%s): %s", path.c_str(),
suffixes[s].c_str(), coil::flatten(tmp).c_str()));
flist.insert(flist.end(), tmp.begin(), tmp.end());
@@ -489,9 +498,11 @@
// reformat file path and remove cached files
for (size_t j(0); j < flist.size(); ++j)
{
- if (*(path.end() - 1) != '/') { path += "/"; }
- std::string fpath(path + flist[j]);
- addNewFile(fpath, modules);
+ //if (*(path.end() - 1) != '/') { path += "/"; }
+ //std::string fpath(path + flist[j]);
+ //addNewFile(fpath, modules);
+ coil::replaceString(flist[j], "\\", "/");
+ addNewFile(flist[j], modules);
}
}
}
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am 2018-03-28 05:16:12 UTC (rev 3279)
@@ -11,8 +11,8 @@
rm -rf ComponentObserverConsumer
src:
- cp -p $(top_srcdir)/src/ext/sdo/observer/*.cpp .
- cp -p $(top_srcdir)/src/ext/sdo/observer/*.h .
+ cp -p $(top_srcdir)/src/ext/sdo/observer/ComponentObserverConsumer.cpp .
+ cp -p $(top_srcdir)/src/ext/sdo/observer/ComponentObserverConsumer.h .
cp -p $(top_srcdir)/src/ext/sdo/observer/*.idl .
qkc -O- -ms *.cpp
qkc -O- -ms *.h
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm.sh 2018-03-28 05:16:12 UTC (rev 3279)
@@ -24,7 +24,11 @@
if test "x$ARCH" = "x" ; then
export ARCH=x86
fi
+if test "x$SSL_VERSION" = "x" ; then
+ export SSL_VERSION=1.1.0
+fi
+
export PATH=/cygdrive/c/cygwin64/bin:$PATH
echo `pwd`
@@ -61,10 +65,14 @@
else
PY_VERSION=`echo ${PYTHON_DIR} | sed 's/.*ython\([0-9][0-9]\).*/\1/'`
fi
- base_url="http://openrtm.org/pub/omniORB/win32/omniORB-${OMNI_VERSION}/"
+ base_url="https://openrtm.org/pub/omniORB/win32/omniORB-${OMNI_VERSION}/"
OMNIORB_ZIP=omniORB-${OMNI_VERSION}-${WIN_ARCH}-vc${VC_VERSION}-py${PY_VERSION}.zip
OMNIORB_URL=${base_url}/${OMNIORB_ZIP}
+
+ base_ssl_url="https://openrtm.org/pub/OpenSSL/${SSL_VERSION}"
+ OPENSSL_ZIP=openssl-${SSL_VERSION}e-${WIN_ARCH}-vc${VC_VERSION}.zip
+ OPENSSL_URL=${base_ssl_url}/${OPENSSL_ZIP}
}
unpack_omnibin()
@@ -85,9 +93,25 @@
omnidir=`find ./ -maxdepth 1 -name 'omniORB*' -type d`
mv ${omnidir} omniORB
}
+
+unpack_openssl()
+{
+ if test ! -f $OPENSSL_ZIP ; then
+ wget $OPENSSL_URL
+ fi
+ unzip $OPENSSL_ZIP
+}
+rename_ssldir()
+{
+ mv _OpenSSL OpenSSL
+}
+
+
check_env
unpack_omnibin
rename_omnidir
+unpack_openssl
+rename_ssldir
# end of ecript
#==============================
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-28 05:07:19 UTC (rev 3278)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-28 05:16:12 UTC (rev 3279)
@@ -6,12 +6,12 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes)"
+ AdditionalIncludeDirectories="$(ssl_includes);$(omni_includes);$(rtm_includes)"
PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
+ AdditionalLibraryDirectories="$(ssl_libdir);$(omni_libdir);$(rtm_libdir)"
/>
<UserMacro
Name="ssl_root"
@@ -72,12 +72,29 @@
/>
<UserMacro
Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
+ Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib omnisslTP$(omnissl_dllver)_rt.lib"
/>
<UserMacro
Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
+ Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib omnisslTP$(omnissl_dllver)_rtd.lib"
/>
+ <!-- OpenSSL macros -->
+ <UserMacro
+ Name="ssl_includes"
+ Value=""$(ssl_root)\include""
+ />
+ <UserMacro
+ Name="ssl_libdir"
+ Value=""$(ssl_root)\lib""
+ />
+ <UserMacro
+ Name="ssl_lib"
+ Value="libssl.lib libcrypto.lib"
+ />
+ <UserMacro
+ Name="ssl_libd"
+ Value="libssl.lib libcrypto.lib"
+ />
<!-- OpenRTM-aist macros -->
<UserMacro
Name="rtm_includes"
@@ -97,19 +114,19 @@
/>
<UserMacro
Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(ssl_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
/>
<UserMacro
Name="rtm_libd_x64"
- Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(ssl_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
/>
<UserMacro
Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ Value="RTC$(rtm_dllver).lib $(coil_lib) $(ssl_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
/>
<UserMacro
Name="rtm_lib_x64"
- Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(ssl_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
/>
<UserMacro
Name="rtm_idlc"
openrtm-commit メーリングリストの案内