From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 1 Jan 2009 13:32:17 +0000 (+0000)
Subject: Sync to trunk r38250
X-Git-Tag: ReactOS-0.3.11~832^8~68
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=79287b3e31267c36221956f0a8aa38b0ee5fbbae

Sync to trunk r38250

svn path=/branches/ros-amd64-bringup/; revision=38496
---

79287b3e31267c36221956f0a8aa38b0ee5fbbae
diff --cc reactos/dll/cpl/desk/desk.rbuild
index c08264f0580,131e0da4862..301884c4dbc
--- a/reactos/dll/cpl/desk/desk.rbuild
+++ b/reactos/dll/cpl/desk/desk.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes">
+ <module name="desk" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_DESK}" installbase="system32" installname="desk.cpl" unicode="yes" crt="msvcrt">
 -	<importlibrary definition="desk.def" />
 +	<importlibrary definition="desk.spec" />
  	<include base="desk">.</include>
  	<define name="_WIN32" />
  	<library>kernel32</library>
diff --cc reactos/dll/cpl/intl/intl.rbuild
index 469c1d8bcf9,800c9ec3cb9..9e0387519a8
--- a/reactos/dll/cpl/intl/intl.rbuild
+++ b/reactos/dll/cpl/intl/intl.rbuild
@@@ -1,24 -1,24 +1,24 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes">
+ <module name="intl" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_INTL}" installbase="system32" installname="intl.cpl" unicode="yes" crt="msvcrt">
 -    <importlibrary definition="intl.def" />
 -    <include base="intl">.</include>
 -    <library>kernel32</library>
 -    <library>user32</library>
 -    <library>comctl32</library>
 -    <library>advapi32</library>
 -    <library>setupapi</library>
 -    <library>shell32</library>
 -    <file>currency.c</file>
 -    <file>date.c</file>
 -    <file>generalp.c</file>
 -    <file>intl.c</file>
 -    <file>inplocale.c</file>
 -    <file>numbers.c</file>
 -    <file>time.c</file>
 -    <file>misc.c</file>
 -    <file>languages.c</file>
 -    <file>advanced.c</file>
 -    <file>sort.c</file>
 -    <file>intl.rc</file>
 +	<importlibrary definition="intl.spec" />
 +	<include base="intl">.</include>
 +	<library>kernel32</library>
 +	<library>user32</library>
 +	<library>comctl32</library>
 +	<library>advapi32</library>
 +	<library>setupapi</library>
 +	<library>shell32</library>
 +	<file>currency.c</file>
 +	<file>date.c</file>
 +	<file>generalp.c</file>
 +	<file>intl.c</file>
 +	<file>inplocale.c</file>
 +	<file>numbers.c</file>
 +	<file>time.c</file>
 +	<file>misc.c</file>
 +	<file>languages.c</file>
 +	<file>advanced.c</file>
 +	<file>sort.c</file>
 +	<file>intl.rc</file>
  </module>
diff --cc reactos/dll/cpl/main/main.rbuild
index 5a6d2804df4,563add0c1ea..115649589fc
--- a/reactos/dll/cpl/main/main.rbuild
+++ b/reactos/dll/cpl/main/main.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes">
+ <module name="main" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_MAIN}" installbase="system32" installname="main.cpl" unicode="yes" crt="msvcrt">
 -	<importlibrary definition="main.def" />
 +	<importlibrary definition="main.spec" />
  	<include base="main">.</include>
  	<library>kernel32</library>
  	<library>advapi32</library>
diff --cc reactos/dll/cpl/usrmgr/usrmgr.rbuild
index 1988b4d3e5e,1a612c983cf..ad2925f3fbb
--- a/reactos/dll/cpl/usrmgr/usrmgr.rbuild
+++ b/reactos/dll/cpl/usrmgr/usrmgr.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes">
+ <module name="usrmgr" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_USRMGR}" installbase="system32" installname="usrmgr.cpl" unicode="yes" crt="msvcrt">
 -	<importlibrary definition="usrmgr.def" />
 +	<importlibrary definition="usrmgr.spec" />
  	<include base="usrmgr">.</include>
  	<library>kernel32</library>
  	<library>advapi32</library>
diff --cc reactos/dll/directx/ddraw/ddraw.rbuild
index 153564ce512,ab7913808b3..97a5d890ac0
--- a/reactos/dll/directx/ddraw/ddraw.rbuild
+++ b/reactos/dll/directx/ddraw/ddraw.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes">
+ <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" unicode="yes" crt="msvcrt">
 -	<importlibrary definition="ddraw.def" />
 +	<importlibrary definition="ddraw.spec" />
  	<include base="ddraw">.</include>
  	<library>kernel32</library>
  	<library>user32</library>
diff --cc reactos/dll/win32/gdi32/gdi32.rbuild
index a06f4ba2b02,91ddb0c3a4a..e407d5a28a8
--- a/reactos/dll/win32/gdi32/gdi32.rbuild
+++ b/reactos/dll/win32/gdi32/gdi32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" allowwarnings="true">
 -<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll">
 -	<importlibrary definition="gdi32.def" />
++<module name="gdi32" type="win32dll" baseaddress="${BASEADDRESS_GDI32}" installbase="system32" installname="gdi32.dll" unicode="yes" crt="dll" allowwarnings="true">
 +	<importlibrary definition="gdi32.spec" />
  	<include base="gdi32">include</include>
  	<define name="_DISABLE_TIDENTS" />
  	<define name="LANGPACK" />
diff --cc reactos/dll/win32/glu32/glu32.rbuild
index eb5aee7b9a9,9ce9837c580..fd75052d2e6
--- a/reactos/dll/win32/glu32/glu32.rbuild
+++ b/reactos/dll/win32/glu32/glu32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true">
+ <module name="glu32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_GLU32}" installbase="system32" installname="glu32.dll" allowwarnings="true" crt="msvcrt">
 -	<importlibrary definition="glu32.def" />
 +	<importlibrary definition="glu32.spec" />
  	<include base="glu32">include</include>
  	<include base="glu32">libnurbs/internals</include>
  	<include base="glu32">libnurbs/interface</include>
diff --cc reactos/dll/win32/kernel32/kernel32.rbuild
index 353cfeb860c,7b5041add9d..046685f4cf3
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
  <group>
- 	<module name="kernel32_base" type="objectlibrary" allowwarnings="true">
 -	<module name="kernel32_base" type="objectlibrary" crt="dll">
++	<module name="kernel32_base" type="objectlibrary" crt="dll" allowwarnings="true">
  		<include base="kernel32_base">.</include>
  		<include base="kernel32_base">include</include>
  		<include base="ReactOS">include/reactos/subsys</include>
@@@ -141,8 -135,8 +141,8 @@@
  		</directory>
  		<library>normalize</library>
  	</module>
- 	<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
+ 	<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll">
 -		<importlibrary definition="kernel32.def" />
 +		<importlibrary definition="kernel32.spec" />
  		<include base="kernel32">.</include>
  		<include base="kernel32" root="intermediate">.</include>
  		<include base="kernel32">include</include>
diff --cc reactos/dll/win32/opengl32/opengl32.rbuild
index 5c01e9307f2,7f40023262a..6836100f080
--- a/reactos/dll/win32/opengl32/opengl32.rbuild
+++ b/reactos/dll/win32/opengl32/opengl32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes">
+ <module name="opengl32" type="win32dll" baseaddress="${BASEADDRESS_OPENGL32}" installbase="system32" installname="opengl32.dll" unicode="yes" crt="msvcrt">
 -	<importlibrary definition="opengl32.def" />
 +	<importlibrary definition="opengl32.spec" />
  	<define name="_DISABLE_TIDENTS" />
  	<library>ntdll</library>
  	<library>kernel32</library>
diff --cc reactos/dll/win32/user32/user32.rbuild
index cd819232ab3,246b26b1be6..b278c956e5f
--- a/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@@@ -1,5 -1,5 +1,5 @@@
- <module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" allowwarnings="true">
 -<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll">
 -	<importlibrary definition="user32.def" />
++<module name="user32" type="win32dll" baseaddress="${BASEADDRESS_USER32}" installbase="system32" installname="user32.dll" unicode="yes" crt="dll" allowwarnings="true">
 +	<importlibrary definition="user32.pspec" />
  	<include base="user32">.</include>
  	<include base="user32">include</include>
  	<include base="ReactOS">include/reactos/subsys</include>