Amine Khaldi [Fri, 24 Dec 2010 13:38:27 +0000 (13:38 +0000)]
[CMAKE]
- Improve formatting, mainly the uppercase macro names. No functionality change.
svn path=/branches/cmake-bringup/; revision=50124
Amine Khaldi [Fri, 24 Dec 2010 12:23:19 +0000 (12:23 +0000)]
[CMAKE]
- Fix shell32.
- Fix and enable mstask.
svn path=/branches/cmake-bringup/; revision=50123
Timo Kreuzer [Fri, 24 Dec 2010 12:13:17 +0000 (12:13 +0000)]
[CMAKE]
Don't compile telnet and explorer on MSVC for now
svn path=/branches/cmake-bringup/; revision=50122
Amine Khaldi [Fri, 24 Dec 2010 12:08:24 +0000 (12:08 +0000)]
[CMAKE]
- Add a macro to handle IDL interfaces.
svn path=/branches/cmake-bringup/; revision=50119
Amine Khaldi [Fri, 24 Dec 2010 11:42:18 +0000 (11:42 +0000)]
[CMAKE]
- Use SIZE_T in MIDL_user_allocate. This reverts r49295.
svn path=/branches/cmake-bringup/; revision=50118
Amine Khaldi [Wed, 22 Dec 2010 16:37:32 +0000 (16:37 +0000)]
[CMAKE]
- Add rostests to build when the folder exists.
- Alter the importlib target macro to handle definition files along with spec files.
svn path=/branches/cmake-bringup/; revision=50101
Jérôme Gardou [Mon, 20 Dec 2010 23:51:41 +0000 (23:51 +0000)]
[CMAKE]
- issue an error when an invalid module type is provided
- add nativedll module type.
svn path=/branches/cmake-bringup/; revision=50075
Amine Khaldi [Sun, 19 Dec 2010 23:00:46 +0000 (23:00 +0000)]
[CMAKE]
- Use an actual entrypoint for oleacc. Reflects r50064.
svn path=/branches/cmake-bringup/; revision=50065
Timo Kreuzer [Sun, 19 Dec 2010 17:01:35 +0000 (17:01 +0000)]
[CMAKE]
Fix configure script for msvc
svn path=/branches/cmake-bringup/; revision=50062
Amine Khaldi [Fri, 17 Dec 2010 21:54:56 +0000 (21:54 +0000)]
[CMAKE]
- Improve several modules.
svn path=/branches/cmake-bringup/; revision=50055
Timo Kreuzer [Fri, 17 Dec 2010 20:11:04 +0000 (20:11 +0000)]
[CMAKE]
Add a simple configure script for windows hosts. Run it from any path, where you want to build both the tools and reactos in 2 subfolders.
svn path=/branches/cmake-bringup/; revision=50054
Amine Khaldi [Fri, 17 Dec 2010 13:54:13 +0000 (13:54 +0000)]
[CMAKE]
- Improve mciwave.
svn path=/branches/cmake-bringup/; revision=50051
Amine Khaldi [Fri, 17 Dec 2010 13:45:27 +0000 (13:45 +0000)]
[CMAKE]
- Fix msacm32.dll entry point. This fixes the World Peace issue, I mean, bootcd and livecd userinit exception issue. We get to the shell now in both. Thanks to Johannes for helping me investigate this.
svn path=/branches/cmake-bringup/; revision=50050
Amine Khaldi [Thu, 16 Dec 2010 15:42:17 +0000 (15:42 +0000)]
[CMAKE]
- Update some more base addresses. Thanks to Roel for his help.
svn path=/branches/cmake-bringup/; revision=50039
Amine Khaldi [Thu, 16 Dec 2010 15:03:13 +0000 (15:03 +0000)]
[CMAKE]
- Assign a base address to ftfd.
svn path=/branches/cmake-bringup/; revision=50038
Amine Khaldi [Thu, 16 Dec 2010 14:35:26 +0000 (14:35 +0000)]
[CMAKE]
- Update some base addresses to adapt to new binary sizes. Thanks to Roel for his help.
svn path=/branches/cmake-bringup/; revision=50037
Amine Khaldi [Wed, 15 Dec 2010 23:37:54 +0000 (23:37 +0000)]
[CMAKE]
- Arty: Add usermode addresses translation support. WIP.
svn path=/branches/cmake-bringup/; revision=50033
Amine Khaldi [Mon, 13 Dec 2010 12:25:51 +0000 (12:25 +0000)]
[CMAKE]
- Fix winspool import lib target.
- Improve some modules.
svn path=/branches/cmake-bringup/; revision=50023
Timo Kreuzer [Sat, 11 Dec 2010 17:04:24 +0000 (17:04 +0000)]
[CMAKE]
Revert some idl changes from r49286 and r49293, that broke mouse
and keyboard in 2nd stage.
svn path=/branches/cmake-bringup/; revision=50011
Amine Khaldi [Fri, 10 Dec 2010 16:08:35 +0000 (16:08 +0000)]
[CMAKE]
- Add some importlib targets.
svn path=/branches/cmake-bringup/; revision=50005
Timo Kreuzer [Sat, 4 Dec 2010 21:16:35 +0000 (21:16 +0000)]
[ROSSYM]
Silence debug prints
svn path=/branches/cmake-bringup/; revision=49953
Timo Kreuzer [Sat, 4 Dec 2010 20:18:24 +0000 (20:18 +0000)]
[CMAKE]
Give ntdll a baseaddress
svn path=/branches/cmake-bringup/; revision=49952
Timo Kreuzer [Sat, 4 Dec 2010 12:54:17 +0000 (12:54 +0000)]
[CMAKE]
"don't assign 1 to a BOOL variable"
svn path=/branches/cmake-bringup/; revision=49947
Timo Kreuzer [Sat, 4 Dec 2010 12:48:02 +0000 (12:48 +0000)]
[CMAKE]
- Fix configuration with cmake-gui (BOOL variables are TRUE/FALSE not 0/1)
- Remove unused DBG_OR_KDBG
svn path=/branches/cmake-bringup/; revision=49946
Amine Khaldi [Fri, 3 Dec 2010 22:32:02 +0000 (22:32 +0000)]
[CMAKE]
- Activate ws2_32.
svn path=/branches/cmake-bringup/; revision=49943
Amine Khaldi [Fri, 3 Dec 2010 22:23:37 +0000 (22:23 +0000)]
[CMAKE]
- Emit debug info.
svn path=/branches/cmake-bringup/; revision=49942
Timo Kreuzer [Fri, 3 Dec 2010 21:05:01 +0000 (21:05 +0000)]
[CMAKE]
Remove duplicated dll import
svn path=/branches/cmake-bringup/; revision=49940
Sylvain Petreolle [Fri, 3 Dec 2010 19:41:06 +0000 (19:41 +0000)]
[CMAKE]
Revert 49926.
Its not needed anymore after timo's stubs.h fix in 49933.
svn path=/branches/cmake-bringup/; revision=49938
Amine Khaldi [Fri, 3 Dec 2010 19:20:45 +0000 (19:20 +0000)]
[CMAKE]
- Improve some modules.
- Convert notifyhook def into a spec, and add the import lib target.
- Get rid of the import libs that we already generate (the rest are still just temporary)
svn path=/branches/cmake-bringup/; revision=49937
Timo Kreuzer [Fri, 3 Dec 2010 17:51:03 +0000 (17:51 +0000)]
[CMAKE]
define inline to __inline for host tools on MSVC builds
svn path=/branches/cmake-bringup/; revision=49934
Timo Kreuzer [Fri, 3 Dec 2010 17:48:03 +0000 (17:48 +0000)]
[CMAKE]
include debug.h explicitly from reactos folder, to avoid including the wine one. Fixes ws2_32
svn path=/branches/cmake-bringup/; revision=49933
Amine Khaldi [Fri, 3 Dec 2010 17:41:29 +0000 (17:41 +0000)]
[CMAKE]
- Improve more modules.
svn path=/branches/cmake-bringup/; revision=49932
Amine Khaldi [Fri, 3 Dec 2010 16:17:41 +0000 (16:17 +0000)]
[CMAKE]
- Add dllname optional parameter to the import lib creation macro.
- Use it in the kernel.
svn path=/branches/cmake-bringup/; revision=49930
Sylvain Petreolle [Fri, 3 Dec 2010 13:48:48 +0000 (13:48 +0000)]
[CMAKE]
Manual stubs for user32.
svn path=/branches/cmake-bringup/; revision=49926
Timo Kreuzer [Fri, 3 Dec 2010 13:41:06 +0000 (13:41 +0000)]
[CMAKE]
Some manual stubs for mapi32
svn path=/branches/cmake-bringup/; revision=49925
Timo Kreuzer [Fri, 3 Dec 2010 12:08:09 +0000 (12:08 +0000)]
[CMAKE]
Fix libshdocvw
svn path=/branches/cmake-bringup/; revision=49921
Amine Khaldi [Fri, 3 Dec 2010 11:01:21 +0000 (11:01 +0000)]
[CMAKE]
- More work on import lib targets and improving modules.
svn path=/branches/cmake-bringup/; revision=49916
Amine Khaldi [Fri, 3 Dec 2010 10:26:32 +0000 (10:26 +0000)]
[CMAKE]
- More work on import lib targets and improving modules.
svn path=/branches/cmake-bringup/; revision=49914
Amine Khaldi [Fri, 3 Dec 2010 09:26:06 +0000 (09:26 +0000)]
[CMAKE]
- Start adding proper import lib targets.
- Improve some modules.
svn path=/branches/cmake-bringup/; revision=49913
Amine Khaldi [Thu, 2 Dec 2010 23:37:33 +0000 (23:37 +0000)]
[CMAKE]
- Adapt to the new spec2def syntax.
svn path=/branches/cmake-bringup/; revision=49908
Amine Khaldi [Thu, 2 Dec 2010 23:20:22 +0000 (23:20 +0000)]
[CMAKE]
- WIP: Make rossym and its users rely on dwarf debug info. Brought to you by the Arty.
svn path=/branches/cmake-bringup/; revision=49906
Timo Kreuzer [Thu, 2 Dec 2010 22:24:58 +0000 (22:24 +0000)]
[CMAKE]
Fix compilation of setupldr on msvc
svn path=/branches/cmake-bringup/; revision=49905
Timo Kreuzer [Thu, 2 Dec 2010 22:16:59 +0000 (22:16 +0000)]
[CMAKE]
Invoke spec2def only once to generate asm stub and def file.
svn path=/branches/cmake-bringup/; revision=49904
Amine Khaldi [Thu, 2 Dec 2010 21:56:40 +0000 (21:56 +0000)]
[CMAKE]
- Group some cross compiling related sections.
- Implement add_importlib_target() for gcc.
- Improve the msvc version.
svn path=/branches/cmake-bringup/; revision=49903
Timo Kreuzer [Thu, 2 Dec 2010 19:44:46 +0000 (19:44 +0000)]
[CMAKE]
On MSVC builds link eventvwr, dwnl, ftp, ping, telnet, tracert to ntdll to resolve _allmul and friends
link ftp to oldnames
svn path=/branches/cmake-bringup/; revision=49902
Timo Kreuzer [Thu, 2 Dec 2010 19:18:25 +0000 (19:18 +0000)]
[CMAKE]
Cleanup old comment
svn path=/branches/cmake-bringup/; revision=49901
Timo Kreuzer [Thu, 2 Dec 2010 19:13:47 +0000 (19:13 +0000)]
[CMAKE]
- Add importlib for dplayx, ksuser, wined3d
- link dplay to dplayx
svn path=/branches/cmake-bringup/; revision=49900
Sylvain Petreolle [Thu, 2 Dec 2010 14:57:32 +0000 (14:57 +0000)]
[CMAKE]
Fix shlwapi.
svn path=/branches/cmake-bringup/; revision=49899
Timo Kreuzer [Thu, 2 Dec 2010 13:37:59 +0000 (13:37 +0000)]
[MSVC]
Fix typeof(WineDirect3DCreateClipper) definition for MSVC.
svn path=/branches/cmake-bringup/; revision=49897
Sylvain Petreolle [Thu, 2 Dec 2010 13:32:01 +0000 (13:32 +0000)]
[CMAKE]
Update msvcrt stubs.
svn path=/branches/cmake-bringup/; revision=49896
Sylvain Petreolle [Thu, 2 Dec 2010 12:58:59 +0000 (12:58 +0000)]
[CMAKE]
Fix build for winmm and syssetup.
svn path=/branches/cmake-bringup/; revision=49895
Sylvain Petreolle [Thu, 2 Dec 2010 12:38:16 +0000 (12:38 +0000)]
[CMAKE]
Disable msnet32.
svn path=/branches/cmake-bringup/; revision=49894
Sylvain Petreolle [Thu, 2 Dec 2010 12:36:16 +0000 (12:36 +0000)]
[CMAKE]
Add stubs file to source automatically.
Gcc: fix set_rc_compiler() so that it doesn't conflict with custom_incdefs().
svn path=/branches/cmake-bringup/; revision=49893
Timo Kreuzer [Thu, 2 Dec 2010 12:14:35 +0000 (12:14 +0000)]
[CMAKE]
D3DXCreateTexture is already implemented, not a stub
svn path=/branches/cmake-bringup/; revision=49892
Timo Kreuzer [Thu, 2 Dec 2010 11:49:15 +0000 (11:49 +0000)]
[CMAKE]
- Link wine dx, that do forwards to the respective import libs (MSVC requires that)
- add import lib for d3dx9_24
- add IID_IUnknown to d3dx9_36_main.c for MSVC
svn path=/branches/cmake-bringup/; revision=49891
Timo Kreuzer [Thu, 2 Dec 2010 11:45:24 +0000 (11:45 +0000)]
[CMAKE]
add libd3dx9_24.a
svn path=/branches/cmake-bringup/; revision=49890
Timo Kreuzer [Thu, 2 Dec 2010 11:44:24 +0000 (11:44 +0000)]
[CMAKE]
Generate proper stdcall stubs for d3dx9_24 and d3dx9_36
Fix D3DXLoadSurfaceFromSurface parameters
svn path=/branches/cmake-bringup/; revision=49889
Timo Kreuzer [Wed, 1 Dec 2010 21:39:38 +0000 (21:39 +0000)]
[CMAKE]
Convert __wine_spec_unimplemented_stub to a macro
svn path=/branches/cmake-bringup/; revision=49888
Timo Kreuzer [Wed, 1 Dec 2010 21:16:25 +0000 (21:16 +0000)]
[CMAKE]
Manual stubs for comctl32
svn path=/branches/cmake-bringup/; revision=49887
Amine Khaldi [Wed, 1 Dec 2010 20:49:45 +0000 (20:49 +0000)]
[CMAKE]
- Inhibit all warning messages for mesa32.
svn path=/branches/cmake-bringup/; revision=49886
Timo Kreuzer [Wed, 1 Dec 2010 20:29:09 +0000 (20:29 +0000)]
[CMAKE]
Manual stubs for cabinet
svn path=/branches/cmake-bringup/; revision=49885
Timo Kreuzer [Wed, 1 Dec 2010 20:11:15 +0000 (20:11 +0000)]
[CMAKE]
Fix browseui
svn path=/branches/cmake-bringup/; revision=49884
Timo Kreuzer [Wed, 1 Dec 2010 18:28:34 +0000 (18:28 +0000)]
[CMAKE]
wine depends on buildno header
svn path=/branches/cmake-bringup/; revision=49883
Timo Kreuzer [Wed, 1 Dec 2010 14:56:05 +0000 (14:56 +0000)]
[PSDK]
Fix include guard for unknown.h
svn path=/branches/cmake-bringup/; revision=49882
Sylvain Petreolle [Wed, 1 Dec 2010 13:36:16 +0000 (13:36 +0000)]
[CMAKE]
Fix dwmapi, mpr and msxml3.
Ordinal stubs were given the same internal names as Wine.
svn path=/branches/cmake-bringup/; revision=49881
Timo Kreuzer [Wed, 1 Dec 2010 13:16:39 +0000 (13:16 +0000)]
[CMAKE]
manual stubs for atl
svn path=/branches/cmake-bringup/; revision=49880
Timo Kreuzer [Wed, 1 Dec 2010 09:44:45 +0000 (09:44 +0000)]
[CMAKE]
Manual stubs for activeds
svn path=/branches/cmake-bringup/; revision=49879
Sylvain Petreolle [Tue, 30 Nov 2010 22:31:17 +0000 (22:31 +0000)]
[CMAKE]
Fix msvcrt and query build.
svn path=/branches/cmake-bringup/; revision=49878
Sylvain Petreolle [Tue, 30 Nov 2010 20:57:01 +0000 (20:57 +0000)]
[CMAKE]
Stubs: Fix some win32 modules.
svn path=/branches/cmake-bringup/; revision=49876
Sylvain Petreolle [Tue, 30 Nov 2010 17:51:44 +0000 (17:51 +0000)]
[CMAKE]
Add d3dx9_36 importlib.
svn path=/branches/cmake-bringup/; revision=49874
Sylvain Petreolle [Mon, 29 Nov 2010 23:08:38 +0000 (23:08 +0000)]
[CMAKE]
Stubs: Fix some win32 modules.
svn path=/branches/cmake-bringup/; revision=49871
Timo Kreuzer [Mon, 29 Nov 2010 19:42:58 +0000 (19:42 +0000)]
[CMAKE]
Fix stubs and imports for wine dx
svn path=/branches/cmake-bringup/; revision=49870
Timo Kreuzer [Mon, 29 Nov 2010 19:31:43 +0000 (19:31 +0000)]
[CMAKE]
- Add stub file for d3dx9_26 and d3dx9_36
- d3dx9_26 imports from d3dx9_36 (def redirection)
svn path=/branches/cmake-bringup/; revision=49869
Amine Khaldi [Mon, 29 Nov 2010 18:36:22 +0000 (18:36 +0000)]
[CMAKE]
- Add the stubs file as an output file.
svn path=/branches/cmake-bringup/; revision=49866
Amine Khaldi [Mon, 29 Nov 2010 18:35:43 +0000 (18:35 +0000)]
[CMAKE]
- Add auto stubs support to the msvc based toolchains.
svn path=/branches/cmake-bringup/; revision=49865
Amine Khaldi [Mon, 29 Nov 2010 18:33:07 +0000 (18:33 +0000)]
[CMAKE]
- Add auto stubs support to the gcc based toolchains.
svn path=/branches/cmake-bringup/; revision=49864
Timo Kreuzer [Mon, 29 Nov 2010 18:07:36 +0000 (18:07 +0000)]
add stubs.h
svn path=/branches/cmake-bringup/; revision=49863
Timo Kreuzer [Mon, 29 Nov 2010 17:53:20 +0000 (17:53 +0000)]
[SPEC2DEF]
- add support for stubs generation
- add support for "proper" stubs, with calling convention and parameter dump
- handle -private
- change invokation a bit
[CMAKE]
- remove the old VARIANT hack
svn path=/branches/cmake-bringup/; revision=49862
Timo Kreuzer [Mon, 29 Nov 2010 14:43:30 +0000 (14:43 +0000)]
[DXSDK]
Don't use stdole32.tlb.
Seems that this is the problem that made midl fail. Maybe not. Yesterday it was all about VARIANT, which has no effect today. Let's see what tomorrow will bring :-?
svn path=/branches/cmake-bringup/; revision=49860
Timo Kreuzer [Mon, 29 Nov 2010 09:29:20 +0000 (09:29 +0000)]
[WINE]
Add msvchelper.h, a file that helps wine dx stuff to comple on msvc.
svn path=/branches/cmake-bringup/; revision=49859
Timo Kreuzer [Sun, 28 Nov 2010 21:49:54 +0000 (21:49 +0000)]
[CMAKE]
remove /GR from c++ options, it's on by default and we get a warning when additionally specifiying /GR-
svn path=/branches/cmake-bringup/; revision=49857
Timo Kreuzer [Sun, 28 Nov 2010 20:16:40 +0000 (20:16 +0000)]
[CMAKE]
Make rpcproxy macro portable
svn path=/branches/cmake-bringup/; revision=49856
Timo Kreuzer [Sun, 28 Nov 2010 20:12:05 +0000 (20:12 +0000)]
[CMAKE]
Get rid of the stubs file for quartz, it was a mistake.
svn path=/branches/cmake-bringup/; revision=49855
Timo Kreuzer [Sun, 28 Nov 2010 19:28:03 +0000 (19:28 +0000)]
[CMAKE]
Don't compile CRT_fp8.c, CRT_fp10.c and xtxtmode.c. we don't need those and MSVC complains about duplicate symbols, as it's exported from msvcrt already.
svn path=/branches/cmake-bringup/; revision=49854
Timo Kreuzer [Sun, 28 Nov 2010 19:05:03 +0000 (19:05 +0000)]
[UUID]
Add IID_IStream and IID_IEnumDMO for MSVC
svn path=/branches/cmake-bringup/; revision=49853
Timo Kreuzer [Sun, 28 Nov 2010 16:53:47 +0000 (16:53 +0000)]
[DXSDK]
Put coclass MediaDet into the library DexterLib
svn path=/branches/cmake-bringup/; revision=49852
Timo Kreuzer [Sun, 28 Nov 2010 16:37:46 +0000 (16:37 +0000)]
[WINE]
Add a dummy DECL_GLOBAL_CONSTRUCTOR for MSVC
svn path=/branches/cmake-bringup/; revision=49849
Timo Kreuzer [Sun, 28 Nov 2010 16:22:38 +0000 (16:22 +0000)]
[CMAKE]
Reapply the midl hack. Someone wants to trick me or something. I could swear it just worked one minute ago.
svn path=/branches/cmake-bringup/; revision=49847
Timo Kreuzer [Sun, 28 Nov 2010 16:12:25 +0000 (16:12 +0000)]
[CMAKE]
Fix dependencies for importlib targets
svn path=/branches/cmake-bringup/; revision=49846
Timo Kreuzer [Sun, 28 Nov 2010 15:52:00 +0000 (15:52 +0000)]
[CMAKE]
- Remove the dxsdk hack. It works now without. Why? I don't know. Why didn't it work before? I have no idea. Maybe the newlines. Anyway it works. If someone breaks it, I'll ki^Z^Z revert it ;-)
svn path=/branches/cmake-bringup/; revision=49845
Timo Kreuzer [Sun, 28 Nov 2010 15:47:13 +0000 (15:47 +0000)]
[DXSDK]
- Reenable dxsdk for MSVC
[PSDK/DXSDK]
- add a newlines at the end of several files.
svn path=/branches/cmake-bringup/; revision=49844
Timo Kreuzer [Sun, 28 Nov 2010 15:40:47 +0000 (15:40 +0000)]
[CMAKE]
Add a hack for midl. Don't ask me why, but renaming IEnumVARIANT to something different globally fixes the compilation of dxsdk. someone with more idl knowledge should check that.
svn path=/branches/cmake-bringup/; revision=49843
Timo Kreuzer [Sun, 28 Nov 2010 12:58:10 +0000 (12:58 +0000)]
[CMAKE]
Remove the old global strict_context_handle hack
svn path=/branches/cmake-bringup/; revision=49842
Timo Kreuzer [Sun, 28 Nov 2010 12:40:33 +0000 (12:40 +0000)]
[PSDK]
Add a hack for midl.
svn path=/branches/cmake-bringup/; revision=49841
Timo Kreuzer [Sun, 28 Nov 2010 10:19:28 +0000 (10:19 +0000)]
[CMAKE]
add a number of importlin targets and convert to spec
svn path=/branches/cmake-bringup/; revision=49839
Timo Kreuzer [Sun, 28 Nov 2010 10:14:51 +0000 (10:14 +0000)]
[CRT]
Implement thiscall wrapper for MSVC
svn path=/branches/cmake-bringup/; revision=49838
Timo Kreuzer [Sun, 28 Nov 2010 10:12:35 +0000 (10:12 +0000)]
[UUID]
Add a number of GUIDs. They are duplicated from idl generated headers, because of a small difference between widl and midl. widl generates "DEFINE_GUID" entries for each interface, while midl generates "extern GUID" only. The latter matching MS SDK headers. If someone can think of a more elegant way of solving this, let me know.
svn path=/branches/cmake-bringup/; revision=49837
Timo Kreuzer [Sun, 28 Nov 2010 09:28:28 +0000 (09:28 +0000)]
[PSDK]
Add some GUIDs for MSVC.
svn path=/branches/cmake-bringup/; revision=49835
Timo Kreuzer [Sun, 28 Nov 2010 01:24:36 +0000 (01:24 +0000)]
[CMAKE]
- Link libxslt to ntdll for MSVC
- Don't compile some directx stuff with MSVC atm
- Add importlib target for dinput
- add importlib target for wined3d and use autogenerated def
- Improve quartz
svn path=/branches/cmake-bringup/; revision=49833
Timo Kreuzer [Sun, 28 Nov 2010 01:01:36 +0000 (01:01 +0000)]
[REACTOS]
Fix Italian resource file syntax
svn path=/branches/cmake-bringup/; revision=49832