INTEGRATION: CWS obo24 (1.7.6); FILE MERGED

2008/03/13 11:26:27 obo 1.7.6.1: COMPROOT added for Windows 64bit compiler (used by shell extension)

solenv/config/sdev300.ini

@@ -2284,6 +2284,7 @@ wntmsci11
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
 			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
+			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
 			PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
 			FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
 			DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
@@ -2430,6 +2431,7 @@ wntmsci11
 			SOLARROOT %SOL_TMP%$/r
 			COPYALL TRUE
 			COMPATH %SOL_TMP%$/r$/msvc8p
+			COMPROOT %SOL_TMP%$/r$/msvc8p
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
 			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
 			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
@@ -2446,6 +2448,7 @@ wntmsci11
 			SOLARROOT %SOL_TMP%$/r
 			COPYALL TRUE
 			COMPATH %SOL_TMP%$/r$/msvc8p
+			COMPROOT %SOL_TMP%$/r$/msvc8p
 			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
 			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
 			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
@@ -2462,6 +2465,7 @@ wntmsci11
 			SOLARROOT %SOL_TMP%$/r
 			COPYALL FALSE
 			COMPATH %SOL_TMP%$/r$/msvc8p
+			COMPROOT %SOL_TMP%$/r$/msvc8p
 			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
 			PSDK %COMPATH%$/PlatformSDK
 			FSDK %COMPATH%$/Sdk$/v2.0
@@ -2632,6 +2636,7 @@ wntmsci12
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%\msvc9p\Common7\ide
 			COMPATH %SOLAR_ENV_ROOT%\msvc9p
+			COMPROOT %SOLAR_ENV_ROOT%\msvc9p
 			PSDK %SOLAR_ENV_ROOT%\msvc9p\PlatformSDK\V6.1
 			FSDK %SOLAR_ENV_ROOT%\msvc9p\Sdk\v3.5
 			DSDK %SOLAR_ENV_ROOT%\msvc9p\DirectXSDK
@@ -2794,6 +2799,7 @@ wntmsci12
 			SOLARROOT %SOL_TMP%\r
 			COPYALL TRUE
 			COMPATH %SOL_TMP%\r\msvc9p
+			COMPROOT %SOL_TMP%\r\msvc9p
 			SHARED_COM_SDK_PATH %SOL_TMP%\r\msvc9p\Common7\ide
 			PSDK %SOL_TMP%\r\msvc9p\PlatformSDK\V6.1
 			FSDK %SOL_TMP%\r\msvc9p\Sdk\v2.0
@@ -2812,6 +2818,7 @@ wntmsci12
 			SOLARROOT %SOL_TMP%\r
 			COPYALL TRUE
 			COMPATH %SOL_TMP%\r\msvc9p
+			COMPROOT %SOL_TMP%\r\msvc9p
 			SHARED_COM_SDK_PATH %SOL_TMP%\r\msvc9p\Common7\ide
 			PSDK %SOL_TMP%\r\msvc9p\PlatformSDK\V6.1
 			FSDK %SOL_TMP%\r\msvc9p\Sdk\v2.0
@@ -2830,6 +2837,7 @@ wntmsci12
 			SOLARROOT %SOL_TMP%\r
 			COPYALL FALSE
 			COMPATH %SOL_TMP%\r\msvc9p
+			COMPROOT %SOL_TMP%\r\msvc9p
 			SHARED_COM_SDK_PATH %COMPATH%\Common7\ide
 			PSDK %COMPATH%\PlatformSDK\V6.1
 			FSDK %COMPATH%\Sdk\v2.0