[openrtm-commit:03242] r3244 - in branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist: . ext/sdo/observer

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-19 10:28:39 +0900 (Mon, 19 Mar 2018)
New Revision: 3244

Modified:
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[build,bugfix,->trunk] Build bug fixed.

Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am	2018-03-06 07:08:20 UTC (rev 3243)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/observer/Makefile.am	2018-03-19 01:28:39 UTC (rev 3244)
@@ -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: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2018-03-06 07:08:20 UTC (rev 3243)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2018-03-19 01:28:39 UTC (rev 3244)
@@ -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"
@@ -78,6 +78,23 @@
 		Name="omni_libd"
 		Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_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"