[openrtm-commit:01480] r2580 - in branches/RELENG_1_1/OpenRTM-aist: . examples/AutoTest examples/Composite examples/ConfigSample examples/SeqIO examples/SimpleIO examples/SimpleService src/ext/sdo/observer src/lib/coil/win32 src/lib/coil/win32/coil src/lib/rtm src/lib/rtm/idl win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 10月 21日 (火) 10:12:46 JST
Author: kawauchi
Date: 2014-10-21 10:12:46 +0900 (Tue, 21 Oct 2014)
New Revision: 2580
Modified:
branches/RELENG_1_1/OpenRTM-aist/
branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
Log:
Merged the part of r2556.
Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2555
+ /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2556
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/AutoTest/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -276,7 +276,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(PROVIDER_COMP_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/AutoTestIn_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestIn_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -286,7 +286,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(PROVIDER_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/AutoTestInDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
@@ -296,7 +296,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/AutoTestOut_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestOut_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -306,7 +306,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/AutoTestOutDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -318,7 +318,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(PROVIDER_COMP_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/AutoTestIn_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestIn_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -328,7 +328,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(PROVIDER_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/AutoTestInDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestInDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
@@ -338,7 +338,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/AutoTestOut_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestOut_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -348,7 +348,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/AutoTestOutDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/AutoTestOutDll_vc12.vcxproj
dist-hook:
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -343,7 +343,7 @@
--yaml ../rtc.vcproj.yaml \
--source Controller.cpp ControllerComp.cpp \
--header Controller.h
- qkc -sm $(win32_builddir)/Controller_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/Controller_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -353,7 +353,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source Controller.cpp \
--header Controller.h
- qkc -sm $(win32_builddir)/ControllerDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ControllerDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
@@ -364,7 +364,7 @@
--yaml ../rtc.vcproj.yaml \
--source Motor.cpp MotorComp.cpp \
--header Motor.h
- qkc -sm $(win32_builddir)/Motor_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/Motor_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -374,7 +374,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source Motor.cpp \
--header Motor.h
- qkc -sm $(win32_builddir)/MotorDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/MotorDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
@@ -385,7 +385,7 @@
--yaml ../rtc.vcproj.yaml \
--source Sensor.cpp SensorComp.cpp \
--header Sensor.h
- qkc -sm $(win32_builddir)/Sensor_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/Sensor_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -395,7 +395,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source Sensor.cpp \
--header Sensor.h
- qkc -sm $(win32_builddir)/SensorDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/SensorDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
@@ -404,7 +404,7 @@
--out $(win32_builddir)/Composite_vc11.vcxproj \
--yaml ../rtc.vcproj.yaml \
--source Composite.cpp
- qkc -sm $(win32_builddir)/Composite_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/Composite_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -416,7 +416,7 @@
--yaml ../rtc.vcproj.yaml \
--source Controller.cpp ControllerComp.cpp \
--header Controller.h
- qkc -sm $(win32_builddir)/Controller_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/Controller_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -426,7 +426,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source Controller.cpp \
--header Controller.h
- qkc -sm $(win32_builddir)/ControllerDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ControllerDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
@@ -437,7 +437,7 @@
--yaml ../rtc.vcproj.yaml \
--source Motor.cpp MotorComp.cpp \
--header Motor.h
- qkc -sm $(win32_builddir)/Motor_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/Motor_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -447,7 +447,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source Motor.cpp \
--header Motor.h
- qkc -sm $(win32_builddir)/MotorDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/MotorDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
@@ -458,7 +458,7 @@
--yaml ../rtc.vcproj.yaml \
--source Sensor.cpp SensorComp.cpp \
--header Sensor.h
- qkc -sm $(win32_builddir)/Sensor_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/Sensor_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -468,7 +468,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source Sensor.cpp \
--header Sensor.h
- qkc -sm $(win32_builddir)/SensorDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/SensorDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
@@ -477,7 +477,7 @@
--out $(win32_builddir)/Composite_vc12.vcxproj \
--yaml ../rtc.vcproj.yaml \
--source Composite.cpp
- qkc -sm $(win32_builddir)/Composite_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/Composite_vc12.vcxproj
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ConfigSample/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -148,7 +148,7 @@
--yaml ../rtc.vcproj.yaml \
--source ConfigSample.cpp ConfigSampleComp.cpp \
--header ConfigSample.h VectorConvert.h
- qkc -sm $(win32_builddir)/ConfigSample_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConfigSample_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -158,7 +158,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source ConfigSample.cpp \
--header ConfigSample.h VectorConvert.h
- qkc -sm $(win32_builddir)/ConfigSampleDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -170,7 +170,7 @@
--yaml ../rtc.vcproj.yaml \
--source ConfigSample.cpp ConfigSampleComp.cpp \
--header ConfigSample.h VectorConvert.h
- qkc -sm $(win32_builddir)/ConfigSample_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConfigSample_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -180,7 +180,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source ConfigSample.cpp \
--header ConfigSample.h VectorConvert.h
- qkc -sm $(win32_builddir)/ConfigSampleDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConfigSampleDll_vc12.vcxproj
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SeqIO/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -224,7 +224,7 @@
--yaml ../rtc.vcproj.yaml \
--source SeqIn.cpp SeqInComp.cpp \
--header SeqIn.h
- qkc -sm $(win32_builddir)/SeqIn_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqIn_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -234,7 +234,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source SeqIn.cpp \
--header SeqIn.h
- qkc -sm $(win32_builddir)/SeqInDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqInDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
@@ -244,7 +244,7 @@
--yaml ../rtc.vcproj.yaml \
--source SeqOut.cpp SeqOutComp.cpp \
--header SeqOut.h
- qkc -sm $(win32_builddir)/SeqOut_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqOut_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -254,7 +254,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source SeqOut.cpp \
--header SeqOut.h
- qkc -sm $(win32_builddir)/SeqOutDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqOutDll_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -266,7 +266,7 @@
--yaml ../rtc.vcproj.yaml \
--source SeqIn.cpp SeqInComp.cpp \
--header SeqIn.h
- qkc -sm $(win32_builddir)/SeqIn_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqIn_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -276,7 +276,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source SeqIn.cpp \
--header SeqIn.h
- qkc -sm $(win32_builddir)/SeqInDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqInDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
@@ -286,7 +286,7 @@
--yaml ../rtc.vcproj.yaml \
--source SeqOut.cpp SeqOutComp.cpp \
--header SeqOut.h
- qkc -sm $(win32_builddir)/SeqOut_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqOut_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -296,7 +296,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source SeqOut.cpp \
--header SeqOut.h
- qkc -sm $(win32_builddir)/SeqOutDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/SeqOutDll_vc12.vcxproj
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -235,7 +235,7 @@
--yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
- qkc -sm $(win32_builddir)/ConsoleIn_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleIn_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -245,7 +245,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
- qkc -sm $(win32_builddir)/ConsoleInDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
@@ -255,7 +255,7 @@
--yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
- qkc -sm $(win32_builddir)/ConsoleOut_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleOut_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -265,7 +265,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
- qkc -sm $(win32_builddir)/ConsoleOutDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -277,7 +277,7 @@
--yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
- qkc -sm $(win32_builddir)/ConsoleIn_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleIn_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -287,7 +287,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
- qkc -sm $(win32_builddir)/ConsoleInDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
@@ -297,7 +297,7 @@
--yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
- qkc -sm $(win32_builddir)/ConsoleOut_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleOut_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -307,7 +307,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
- qkc -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleService/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -292,7 +292,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(PROVIDER_COMP_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/MyServiceProvider_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -302,7 +302,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(PROVIDER_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/MyServiceProviderDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
@@ -312,7 +312,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/MyServiceConsumer_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
@@ -322,7 +322,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/MyServiceConsumerDll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -334,7 +334,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(PROVIDER_COMP_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/MyServiceProvider_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceProvider_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -344,7 +344,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(PROVIDER_SRC) \
--header $(PROVIDER_H)
- qkc -sm $(win32_builddir)/MyServiceProviderDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceProviderDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
@@ -354,7 +354,7 @@
--yaml ../rtc.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/MyServiceConsumer_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumer_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
@@ -364,7 +364,7 @@
--yaml ../rtcdll.vcproj.yaml \
--source $(CONSUMER_COMP_SRC) \
--header $(CONSUMER_H)
- qkc -sm $(win32_builddir)/MyServiceConsumerDll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/MyServiceConsumerDll_vc12.vcxproj
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -117,7 +117,7 @@
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
--source $(OBSERVER_WIN_SRC) \
--header $(OBSERVER_WIN_H)
- qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -129,7 +129,7 @@
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
--source $(OBSERVER_WIN_SRC) \
--header $(OBSERVER_WIN_H)
- qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
vc10proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -141,7 +141,7 @@
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
--source $(OBSERVER_WIN_SRC) \
--header $(OBSERVER_WIN_H)
- qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
vc11proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -153,7 +153,7 @@
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
--source $(OBSERVER_WIN_SRC) \
--header $(OBSERVER_WIN_H)
- qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -165,7 +165,7 @@
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
--source $(OBSERVER_WIN_SRC) \
--header $(OBSERVER_WIN_H)
- qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj
dist-hook: lst vcproj
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -63,7 +63,7 @@
--dep coil.sln.dep \
--out coil_vc11.sln \
`find ./ -name '*_vc11.vcxproj'`
- qkc -ms coil_vc11.sln
+ qkc -O- -ms coil_vc11.sln
coil_vc12.sln: coil.sln.dep vcproj
$(top_srcdir)/build/slntool.py \
@@ -71,5 +71,5 @@
--dep coil.sln.dep \
--out coil_vc12.sln \
`find ./ -name '*_vc12.vcxproj'`
- qkc -ms coil_vc12.sln
+ qkc -O- -ms coil_vc12.sln
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -143,7 +143,7 @@
--yaml libcoil.vcproj.yaml \
--source $(COIL_SRC) \
--header $(COIL_H)
- qkc -sm $(win32_builddir)/libcoil_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/libcoil_vc11.vcxproj
libcoil_vc12.vcxproj: libcoil.vcproj.yaml $(COIL_ALL)
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -154,7 +154,7 @@
--yaml libcoil.vcproj.yaml \
--source $(COIL_SRC) \
--header $(COIL_H)
- qkc -sm $(win32_builddir)/libcoil_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/libcoil_vc12.vcxproj
#------------------------------------------------------------
# for wxs file
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -210,7 +210,7 @@
--yaml libRTC.vcproj.yaml \
--source $(RTC_SRC) \
--header $(rtmheader_HEADERS)
- qkc -sm $(win32_builddir)/rtm/libRTC_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc11.vcxproj
vc12proj: libRTC.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -221,7 +221,7 @@
--yaml libRTC.vcproj.yaml \
--source $(RTC_SRC) \
--header $(rtmheader_HEADERS)
- qkc -sm $(win32_builddir)/rtm/libRTC_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc12.vcxproj
#------------------------------------------------------------
# for wxs file
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -257,7 +257,7 @@
--yaml libRTCSkel.vcproj.yaml \
--source $(SKEL_CPP) \
--header $(SKEL_H)
- qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj
vc12proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -268,7 +268,7 @@
--yaml libRTCSkel.vcproj.yaml \
--source $(SKEL_CPP) \
--header $(SKEL_H)
- qkc -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
#------------------------------------------------------------
# for wxs file
Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-10-21 01:12:46 UTC (rev 2580)
@@ -88,7 +88,7 @@
- Key: WarningLevel
Value: "Level3"
- Key: DebugInformationFormat
- Value: "EditAndContinue"
+ Value: "ProgramDatabase"
VC10_VCPreLinkEventTool:
- Key: Command
Value: |
@@ -194,7 +194,7 @@
- Key: WarningLevel
Value: "Level3"
- Key: DebugInformationFormat
- Value: "EditAndContinue"
+ Value: "ProgramDatabase"
VC10_VCPreLinkEventTool:
- Key: Command
Value: |
Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2014-10-20 06:11:34 UTC (rev 2579)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2014-10-21 01:12:46 UTC (rev 2580)
@@ -48,7 +48,7 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc11.sln \
`find ./ -name '*_vc11.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
- qkc -ms OpenRTM-aist_vc11.sln
+ qkc -O- -ms OpenRTM-aist_vc11.sln
OpenRTM-aist_vc12.sln:
$(top_srcdir)/build/slntool.py \
@@ -56,7 +56,7 @@
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc12.sln \
`find ./ -name '*_vc12.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
- qkc -ms OpenRTM-aist_vc12.sln
+ qkc -O- -ms OpenRTM-aist_vc12.sln
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
More information about the openrtm-commit
mailing list