[openrtm-commit:01355] r2532 - in trunk/OpenRTM-aist/src/ext/ec: artlinux/example logical_time logical_time/example

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-03-15 01:47:46 +0900 (Sat, 15 Mar 2014)
New Revision: 2532

Modified:
   trunk/OpenRTM-aist/src/ext/ec/artlinux/example/
   trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
   trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
Log:
[compat,build] LogicalTimeTrigEC makefiles have been updated. refs #3041


Property changes on: trunk/OpenRTM-aist/src/ext/ec/artlinux/example
___________________________________________________________________
Modified: svn:ignore
   - .deps
Makefile.in

   + .deps
Makefile.in
Makefile


Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am	2014-03-14 16:43:36 UTC (rev 2531)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am	2014-03-14 16:47:46 UTC (rev 2532)
@@ -108,7 +108,7 @@
 win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/ec/logical_time
 PROJNAME=LogicalTimeTriggeredEC
 
-vcproj: vc8proj vc9proj vc10proj
+vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj
 
 vc8proj: 
 	$(top_builddir)/build/vcprojtool.py vcproj              \
@@ -146,7 +146,31 @@
 		--header $(OBSERVER_WIN_H)
 	qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
 
+vc11proj:
+	$(top_builddir)/build/vcxprojtool.py vcxproj              \
+		--type DLL                                        \
+		--vcversion "11.00"                               \
+		--projectname "$(PROJNAME)"                       \
+		--version $(RTM_VERSION)                          \
+		--out $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj \
+		--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml  \
+		--source $(OBSERVER_WIN_SRC)                          \
+		--header $(OBSERVER_WIN_H)
+	qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
 
+vc12proj:
+	$(top_builddir)/build/vcxprojtool.py vcxproj              \
+		--type DLL                                        \
+		--vcversion "12.00"                               \
+		--projectname "$(PROJNAME)"                       \
+		--version $(RTM_VERSION)                          \
+		--out $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj \
+		--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml  \
+		--source $(OBSERVER_WIN_SRC)                          \
+		--header $(OBSERVER_WIN_H)
+	qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj
+
+
 dist-hook: lst vcproj
 
 

Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am	2014-03-14 16:43:36 UTC (rev 2531)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/example/Makefile.am	2014-03-14 16:47:46 UTC (rev 2532)
@@ -127,7 +127,7 @@
 		--header LTTSample.h
 	qkc -sm $(win32_builddir)/LTTSampleDll_vc10.vcxproj
 
-dist-hook: lst vcproj
+dist-hook: lst vcproj all-local
 
 clean-local:
 	rm -f *.bak *.rpo *.sym lib*.*_pure_* *.lst