2008-01-14 15:45:45 +00:00
|
|
|
<?xml version="1.0"?>
|
|
|
|
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
|
|
|
|
<group>
|
2010-06-03 12:47:40 +00:00
|
|
|
<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true" crt="MSVCRT">
|
2005-11-27 22:27:35 +00:00
|
|
|
<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
|
2008-10-21 13:51:49 +00:00
|
|
|
<importlibrary definition="ole32.spec" />
|
2005-07-24 21:42:00 +00:00
|
|
|
<include base="ole32">.</include>
|
2006-02-17 22:59:15 +00:00
|
|
|
<include base="ReactOS">include/reactos/wine</include>
|
2007-04-20 12:23:52 +00:00
|
|
|
<define name="__WINESRC__" />
|
Supersedes r40538, r40539; RosBE bug fixed with a RosBE-specific hack (-nostdinc removed from BUILTIN_CPPFLAGS in rules.mak)
Rbuild rationalization commit, umpteenth of infinite
modified tools/rbuild/backend/mingw/mingw.cpp
modified tools/rbuild/backend/mingw/mingw.h
modified tools/rbuild/backend/mingw/modulehandler.cpp
modified tools/rbuild/backend/mingw/modulehandler.h
modified tools/rbuild/backend/mingw/rules.mak
added tools/rbuild/compilerdirective.cpp
modified tools/rbuild/compilerflag.cpp
modified tools/rbuild/define.cpp
modified tools/rbuild/include.cpp
modified tools/rbuild/module.cpp
modified tools/rbuild/pch.h
modified tools/rbuild/project.cpp
modified tools/rbuild/rbuild.dsp
modified tools/rbuild/rbuild.h
modified tools/rbuild/rbuild.mak
modified tools/rbuild/rbuild.vcproj
modified Makefile
modified ReactOS-generic.rbuild
Almost all build rules moved to a makefile.auto include (rules.mak). Size of makefile.auto reduced to about half
The new rules correctly sort includes, defines and flags in priority order (built-in, project, module type, module, source file)
The new rules don't duplicate flags anymore. Flag sets are defined once, as makefile variables, and then referred to by variable name
Compiler-specific flags, includes and defines can now be set, for almost all compilers and tools
<compilerflag>, <define> and <include> have a new "compiler" attribute, containing a comma-separated list of compilers the directive applies to
C++ compiler renamed to "cxx", "cpp" now correctly refers to the C preprocessor (or work-alike, built-in preprocessors)
Drop "overridable" attribute for <define>, as it never worked right
New <redefine> tag: works like <define>, but undefines the variable before defining it. Several warnings suppressed thanks to it
Slightly changed rule for resource file; conversion to object file now a separate phase that prints "[CVTRES]"
Slightly changed definition of ${gas}
Echo "[AS]" instead of "[GAS]"
Echo "[RC]" for wrc
modified include/crt/mingw32/intrin.h
Now that the correct include paths are passed to the resource compiler, make headers more resource compiler-friendly
modified dll/directx/wine/ddraw/ddraw.rbuild
Apply GCC workaround for PSEH
modified dll/directx/wine/wined3d/wined3d.rbuild
modified dll/win32/riched20/riched20.rbuild
-Wno-format no longer required
modified dll/nls/idndl/idndl.rbuild
modified dll/nls/idndl_redist/idndl_redist.rbuild
modified dll/nls/normaliz_redist/normaliz_redist.rbuild
modified lib/3rdparty/icu4ros/icu4ros.rbuild
modified lib/nls/idna/idna.rbuild
modified lib/nls/normalize/normalize.rbuild
modified lib/nls/scripts/scripts.rbuild
C++ compiler now identified by "cxx"
modified drivers/storage/ide/uniata/uniata.rbuild
modified drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
modified drivers/wdm/audio/drm/drmk/drmk.rbuild
Disable exceptions and RTTI for kernel mode C++ code
modified base/services/umpnpmgr/umpnpmgr.rbuild
modified dll/cpl/ncpa/ncpa.rbuild
modified dll/directx/amstream/amstream.rbuild
modified dll/directx/dinput8/dinput8.rbuild
modified dll/directx/dinput/dinput.rbuild
modified dll/directx/qedit/qedit.rbuild
modified dll/directx/quartz/quartz.rbuild
modified dll/win32/advapi32/advapi32.rbuild
modified dll/win32/atl/atl.rbuild
modified dll/win32/avifil32/avifil32.rbuild
modified dll/win32/browseui/browseui.rbuild
modified dll/win32/comcat/comcat.rbuild
modified dll/win32/crypt32/crypt32.rbuild
modified dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild
modified dll/win32/imm32/imm32.rbuild
modified dll/win32/inetcomm/inetcomm.rbuild
modified dll/win32/localspl/localspl.rbuild
modified dll/win32/mlang/mlang.rbuild
modified dll/win32/msctf/msctf.rbuild
modified dll/win32/mshtml/mshtml.rbuild
modified dll/win32/msi/msi.rbuild
modified dll/win32/mstask/mstask.rbuild
modified dll/win32/msxml3/msxml3.rbuild
modified dll/win32/ntmarta/ntmarta.rbuild
modified dll/win32/objsel/objsel.rbuild
modified dll/win32/ole32/ole32.rbuild
modified dll/win32/oleaut32/oleaut32.rbuild
modified dll/win32/pdh/pdh.rbuild
modified dll/win32/rpcrt4/rpcrt4.rbuild
modified dll/win32/shell32/shell32.rbuild
modified dll/win32/shlwapi/shlwapi.rbuild
modified dll/win32/urlmon/urlmon.rbuild
modified dll/win32/wuapi/wuapi.rbuild
modified include/reactos/idl/idl.rbuild
modified dll/win32/kernel32/kernel32.rbuild
modified dll/nls/idndl/idndl.rbuild
modified lib/nls/idna/idna.rbuild
modified lib/nls/normalize/normalize.rbuild
modified lib/nls/scripts/scripts.rbuild
modified dll/win32/inseng/inseng.rbuild
Use <redefine> instead of <define> for version macros
modified base/setup/usetup/usetup.rbuild
modified base/system/autochk/autochk.rbuild
modified base/system/smss/smss.rbuild
modified dll/3rdparty/dxtn/dxtn.rbuild
modified dll/keyboard/kbda1/kbda1.rbuild
modified dll/keyboard/kbda2/kbda2.rbuild
modified dll/keyboard/kbda3/kbda3.rbuild
modified dll/keyboard/kbdal/kbdal.rbuild
modified dll/keyboard/kbdarme/kbdarme.rbuild
modified dll/keyboard/kbdarmw/kbdarmw.rbuild
modified dll/keyboard/kbdaze/kbdaze.rbuild
modified dll/keyboard/kbdazel/kbdazel.rbuild
modified dll/keyboard/kbdbe/kbdbe.rbuild
modified dll/keyboard/kbdbga/kbdbga.rbuild
modified dll/keyboard/kbdbgm/kbdbgm.rbuild
modified dll/keyboard/kbdbgt/kbdbgt.rbuild
modified dll/keyboard/kbdblr/kbdblr.rbuild
modified dll/keyboard/kbdbr/kbdbr.rbuild
modified dll/keyboard/kbdbur/kbdbur.rbuild
modified dll/keyboard/kbdcan/kbdcan.rbuild
modified dll/keyboard/kbdcr/kbdcr.rbuild
modified dll/keyboard/kbdcz1/kbdcz1.rbuild
modified dll/keyboard/kbdcz/kbdcz.rbuild
modified dll/keyboard/kbdda/kbdda.rbuild
modified dll/keyboard/kbddv/kbddv.rbuild
modified dll/keyboard/kbdes/kbdes.rbuild
modified dll/keyboard/kbdest/kbdest.rbuild
modified dll/keyboard/kbdfc/kbdfc.rbuild
modified dll/keyboard/kbdfi/kbdfi.rbuild
modified dll/keyboard/kbdfr/kbdfr.rbuild
modified dll/keyboard/kbdgeo/kbdgeo.rbuild
modified dll/keyboard/kbdgerg/kbdgerg.rbuild
modified dll/keyboard/kbdgneo/kbdgneo.rbuild
modified dll/keyboard/kbdgr/kbdgr.rbuild
modified dll/keyboard/kbdgrist/kbdgrist.rbuild
modified dll/keyboard/kbdhe/kbdhe.rbuild
modified dll/keyboard/kbdheb/kbdheb.rbuild
modified dll/keyboard/kbdhu/kbdhu.rbuild
modified dll/keyboard/kbdic/kbdic.rbuild
modified dll/keyboard/kbdinasa/kbdinasa.rbuild
modified dll/keyboard/kbdinben/kbdinben.rbuild
modified dll/keyboard/kbdindev/kbdindev.rbuild
modified dll/keyboard/kbdinguj/kbdinguj.rbuild
modified dll/keyboard/kbdinmal/kbdinmal.rbuild
modified dll/keyboard/kbdir/kbdir.rbuild
modified dll/keyboard/kbdit/kbdit.rbuild
modified dll/keyboard/kbdja/kbdja.rbuild
modified dll/keyboard/kbdkaz/kbdkaz.rbuild
modified dll/keyboard/kbdko/kbdko.rbuild
modified dll/keyboard/kbdla/kbdla.rbuild
modified dll/keyboard/kbdlt1/kbdlt1.rbuild
modified dll/keyboard/kbdlv/kbdlv.rbuild
modified dll/keyboard/kbdmac/kbdmac.rbuild
modified dll/keyboard/kbdne/kbdne.rbuild
modified dll/keyboard/kbdno/kbdno.rbuild
modified dll/keyboard/kbdpl1/kbdpl1.rbuild
modified dll/keyboard/kbdpo/kbdpo.rbuild
modified dll/keyboard/kbdro/kbdro.rbuild
modified dll/keyboard/kbdru1/kbdru1.rbuild
modified dll/keyboard/kbdru/kbdru.rbuild
modified dll/keyboard/kbdsg/kbdsg.rbuild
modified dll/keyboard/kbdsk1/kbdsk1.rbuild
modified dll/keyboard/kbdsk/kbdsk.rbuild
modified dll/keyboard/kbdsw/kbdsw.rbuild
modified dll/keyboard/kbdtat/kbdtat.rbuild
modified dll/keyboard/kbdth0/kbdth0.rbuild
modified dll/keyboard/kbdth1/kbdth1.rbuild
modified dll/keyboard/kbdth2/kbdth2.rbuild
modified dll/keyboard/kbdth3/kbdth3.rbuild
modified dll/keyboard/kbdtuf/kbdtuf.rbuild
modified dll/keyboard/kbdtuq/kbdtuq.rbuild
modified dll/keyboard/kbduk/kbduk.rbuild
modified dll/keyboard/kbdur/kbdur.rbuild
modified dll/keyboard/kbdurs/kbdurs.rbuild
modified dll/keyboard/kbdus/kbdus.rbuild
modified dll/keyboard/kbdusa/kbdusa.rbuild
modified dll/keyboard/kbdusl/kbdusl.rbuild
modified dll/keyboard/kbdusr/kbdusr.rbuild
modified dll/keyboard/kbdusx/kbdusx.rbuild
modified dll/keyboard/kbduzb/kbduzb.rbuild
modified dll/keyboard/kbdvntc/kbdvntc.rbuild
modified dll/keyboard/kbdycc/kbdycc.rbuild
modified dll/keyboard/kbdycl/kbdycl.rbuild
modified dll/ntdll/ntdll.rbuild
modified dll/win32/crtdll/crtdll.rbuild
modified dll/win32/dhcpcsvc/dhcpcsvc.rbuild
modified dll/win32/dnsapi/dnsapi.rbuild
modified dll/win32/fmifs/fmifs.rbuild
modified dll/win32/gdi32/gdi32.rbuild
modified dll/win32/lpk/lpk.rbuild
modified dll/win32/msvcrt/msvcrt.rbuild
modified dll/win32/opengl32/opengl32.rbuild
modified dll/win32/psapi/psapi.rbuild
modified dll/win32/rasdlg/rasdlg.rbuild
modified dll/win32/rasman/rasman.rbuild
modified dll/win32/samlib/samlib.rbuild
modified dll/win32/shimgvw/shimgvw.rbuild
modified dll/win32/smdll/smdll.rbuild
modified dll/win32/twain_32/twain_32.rbuild
modified dll/win32/uext2/uext2.rbuild
modified dll/win32/ufat/ufat.rbuild
modified dll/win32/ufatx/ufatx.rbuild
modified dll/win32/untfs/untfs.rbuild
modified dll/win32/user32/user32.rbuild
modified dll/win32/winspool/winspool.rbuild
modified dll/win32/ws2_32/ws2_32.rbuild
modified dll/win32/ws2help/ws2help.rbuild
modified dll/win32/wshirda/wshirda.rbuild
modified drivers/directx/dxapi/dxapi.rbuild
modified drivers/directx/dxgthk/dxgthk.rbuild
modified hal/halarm/generic/generic.rbuild
modified hal/halarm/up/halup.rbuild
modified hal/halppc/generic/generic.rbuild
modified hal/halppc/up/halup.rbuild
modified hal/halx86/generic/generic.rbuild
modified hal/halx86/hal_generic.rbuild
modified hal/halx86/hal_generic_pc.rbuild
modified hal/halx86/hal_generic_up.rbuild
modified hal/halx86/halmp.rbuild
modified hal/halx86/halup.rbuild
modified hal/halx86/halxbox.rbuild
modified lib/3rdparty/libwine/libwine.rbuild
modified lib/epsapi/epsapi.rbuild
modified lib/fslib/ext2lib/ext2lib.rbuild
modified lib/fslib/ntfslib/ntfslib.rbuild
modified lib/fslib/vfatlib/vfatlib.rbuild
modified lib/fslib/vfatxlib/vfatxlib.rbuild
modified lib/ntdllsys/ntdllsys.rbuild
modified lib/sdk/crt/crt.rbuild
modified lib/sdk/dxguid/dxguid.rbuild
modified lib/sdk/nt/nt.rbuild
modified lib/sdk/strmiids/strmiids.rbuild
modified lib/sdk/uuid/uuid.rbuild
modified lib/smlib/smlib.rbuild
modified lib/win32ksys/win32ksys.rbuild
modified ntoskrnl/ntoskrnl-generic.rbuild
modified subsystems/csr/csrsrv/csrsrv.rbuild
modified subsystems/ntvdm/ntvdm.rbuild
modified subsystems/win32/csrss/win32csr/win32csr.rbuild
modified dll/win32/kernel32/kernel32.rbuild
modified lib/drivers/oskittcp/oskittcp.rbuild
Goodbye _DISABLE_TIDENTS, __USE_W32API
svn path=/trunk/; revision=40624
2009-04-21 00:33:41 +00:00
|
|
|
<redefine name="_WIN32_WINNT">0x600</redefine>
|
2008-09-13 18:49:51 +00:00
|
|
|
<define name="_OLE32_" />
|
2009-01-15 17:52:35 +00:00
|
|
|
<define name="ENTRY_PREFIX">OLE32_</define>
|
|
|
|
<define name="PROXY_CLSID">CLSID_PSFactoryBuffer</define>
|
|
|
|
<define name="REGISTER_PROXY_DLL" />
|
2008-09-13 18:49:51 +00:00
|
|
|
<define name="COM_NO_WINDOWS_H" />
|
2005-07-24 21:42:00 +00:00
|
|
|
<library>wine</library>
|
|
|
|
<library>advapi32</library>
|
|
|
|
<library>user32</library>
|
2007-04-20 12:23:52 +00:00
|
|
|
<library>gdi32</library>
|
2008-11-07 11:00:30 +00:00
|
|
|
<library>ole32_irot_client</library>
|
2008-09-13 18:49:51 +00:00
|
|
|
<library>ole32_proxy</library>
|
2005-07-24 21:42:00 +00:00
|
|
|
<library>rpcrt4</library>
|
2007-04-20 12:23:52 +00:00
|
|
|
<library>ntdll</library>
|
|
|
|
<library>uuid</library>
|
2008-09-13 18:49:51 +00:00
|
|
|
<library>pseh</library>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>antimoniker.c</file>
|
|
|
|
<file>bindctx.c</file>
|
2007-04-20 12:23:52 +00:00
|
|
|
<file>classmoniker.c</file>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>clipboard.c</file>
|
2008-11-07 11:00:30 +00:00
|
|
|
<file>comcat.c</file>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>compobj.c</file>
|
|
|
|
<file>compositemoniker.c</file>
|
|
|
|
<file>datacache.c</file>
|
|
|
|
<file>defaulthandler.c</file>
|
2007-04-20 12:23:52 +00:00
|
|
|
<file>dictionary.c</file>
|
|
|
|
<file>enumx.c</file>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>errorinfo.c</file>
|
Finish the Wine sync. These components are not just rc file changes
atl, comctl32, comdlg32, dwmapi, fusion, gdiplus, jscript, mpr, mshtml, msi, msimtf, msxml3, ole32, oleaut32, riched20, shdocvw, shlwapi, urlmon, usp10, version and windowscodecs
Seems to build and boot. /me hides
svn path=/trunk/; revision=48273
2010-07-26 02:26:04 +00:00
|
|
|
<file>filelockbytes.c</file>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>filemoniker.c</file>
|
|
|
|
<file>ftmarshal.c</file>
|
|
|
|
<file>git.c</file>
|
|
|
|
<file>hglobalstream.c</file>
|
|
|
|
<file>ifs.c</file>
|
|
|
|
<file>itemmoniker.c</file>
|
|
|
|
<file>marshal.c</file>
|
|
|
|
<file>memlockbytes.c</file>
|
|
|
|
<file>moniker.c</file>
|
|
|
|
<file>ole2.c</file>
|
|
|
|
<file>ole2stubs.c</file>
|
|
|
|
<file>ole2impl.c</file>
|
|
|
|
<file>ole32_main.c</file>
|
|
|
|
<file>oleobj.c</file>
|
|
|
|
<file>oleproxy.c</file>
|
2008-02-10 12:17:32 +00:00
|
|
|
<file>pointermoniker.c</file>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>regsvr.c</file>
|
|
|
|
<file>rpc.c</file>
|
|
|
|
<file>stg_prop.c</file>
|
|
|
|
<file>stg_stream.c</file>
|
|
|
|
<file>storage32.c</file>
|
|
|
|
<file>stubmanager.c</file>
|
2005-12-12 23:53:06 +00:00
|
|
|
<file>usrmarshal.c</file>
|
2005-07-24 21:42:00 +00:00
|
|
|
<file>ole32res.rc</file>
|
2007-04-20 12:23:52 +00:00
|
|
|
<file>dcom.idl</file>
|
2008-01-14 15:45:45 +00:00
|
|
|
<file>irot.idl</file>
|
2007-07-27 09:49:52 +00:00
|
|
|
<include base="ole32" root="intermediate">.</include>
|
2005-07-24 21:42:00 +00:00
|
|
|
</module>
|
2008-01-14 15:45:45 +00:00
|
|
|
<module name="ole32_irot_server" type="rpcserver">
|
|
|
|
<file>irot.idl</file>
|
|
|
|
</module>
|
|
|
|
<module name="ole32_irot_client" type="rpcclient">
|
|
|
|
<file>irot.idl</file>
|
|
|
|
</module>
|
2009-01-21 14:41:23 +00:00
|
|
|
<module name="ole32_proxy" type="rpcproxy" allowwarnings="true">
|
2008-09-13 18:49:51 +00:00
|
|
|
<define name="_OLE32_" />
|
|
|
|
<define name="COM_NO_WINDOWS_H" />
|
|
|
|
<define name="__WINESRC__" />
|
2009-01-15 17:52:35 +00:00
|
|
|
<define name="ENTRY_PREFIX">OLE32_</define>
|
|
|
|
<define name="PROXY_CLSID">CLSID_PSFactoryBuffer</define>
|
|
|
|
<define name="REGISTER_PROXY_DLL"/>
|
2008-09-13 18:49:51 +00:00
|
|
|
<file>dcom.idl</file>
|
|
|
|
<file>ole32_unknwn.idl</file>
|
|
|
|
<file>ole32_objidl.idl</file>
|
|
|
|
<file>ole32_oleidl.idl</file>
|
|
|
|
</module>
|
2008-01-14 15:45:45 +00:00
|
|
|
</group>
|