Author: akhaldi Date: Thu Oct 28 11:33:02 2010 New Revision: 49325
URL: http://svn.reactos.org/svn/reactos?rev=49325&view=rev Log: [CMAKE] - More work on the missing modules. By Alexey Komarov.
Added: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/atl/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/itss/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/En.rc branches/cmake-bringup/dll/win32/sti/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt branches/cmake-bringup/lib/atl/CMakeLists.txt
Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMakeL... ============================================================================== --- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -20,5 +20,5 @@ #add_subdirectory(msdvbnp) #add_subdirectory(msvidctl) add_subdirectory(qedit) -#add_subdirectory(quartz) #idl +add_subdirectory(quartz) #add_subdirectory(wine)
Added: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/quartz... ============================================================================== --- branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,72 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -DENTRY_PREFIX=QUARTZ_ + -DREGISTER_PROXY_DLL + -DPROXY_DELEGATION + -D_DLL + -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(quartz ${CMAKE_CURRENT_SOURCE_DIR}/quartz.spec ${CMAKE_CURRENT_BINARY_DIR}/quartz.def) + +add_library(quartz SHARED + avidec.c + acmwrapper.c + waveparser.c + videorenderer.c + transform.c + systemclock.c + regsvr.c + pin.c + parser.c + nullrenderer.c + mpegsplit.c + memallocator.c + main.c + filtermapper.c + filtergraph.c + filesource.c + enumregfilters.c + enumpins.c + enummoniker.c + enumfilters.c + dsoundrender.c + enummedia.c + control.c + avisplit.c + version.rc) + +set_module_type(quartz win32dll) + +target_link_libraries(quartz + ${CMAKE_CURRENT_BINARY_DIR}/quartz.def + quartz_proxy + strmiids + uuid + wine + pseh) + +add_importlibs(quartz + msvcrt + advapi32 + dsound + ole32 + oleaut32 + shlwapi + user32 + gdi32 + advapi32 + msvfw32 + msacm32 + rpcrt4 + kernel32 + ntdll) + +add_dependencies(quartz quartz_def) +rpcproxy(quartz quartz_strmif.idl) +add_livecd_target(quartz reactos/system32)
Propchange: branches/cmake-bringup/dll/directx/quartz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLis... ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -2,10 +2,10 @@ add_subdirectory(acledit) add_subdirectory(aclui) add_subdirectory(activeds) -#add_subdirectory(actxprxy) +add_subdirectory(actxprxy) add_subdirectory(advapi32) add_subdirectory(advpack) -#add_subdirectory(atl) +add_subdirectory(atl) add_subdirectory(authz) add_subdirectory(avicap32) add_subdirectory(avifil32) @@ -21,7 +21,7 @@ add_subdirectory(comctl32) add_subdirectory(comdlg32) add_subdirectory(compstui) -#add_subdirectory(credui)#FIXME: \cryptui\/cryptui_Fr.rc:432: syntax error +add_subdirectory(credui) add_subdirectory(crtdll) add_subdirectory(crypt32) add_subdirectory(cryptdlg) @@ -40,8 +40,8 @@ add_subdirectory(gdi32) add_subdirectory(gdiplus) add_subdirectory(getuname) -#add_subdirectory(glu32)# FIXME -#add_subdirectory(hhctrl.ocx) +#add_subdirectory(glu32)# FIXME: set_cpp()? +#add_subdirectory(hhctrl.ocx)#FIXME: regsvr.c.obj:regsvr.c:(.text+0x393): undefined reference to `RegDeleteTreeW' add_subdirectory(hid) add_subdirectory(hlink) add_subdirectory(hnetcfg) @@ -58,8 +58,8 @@ add_subdirectory(iphlpapi) #add_subdirectory(iprtprio) add_subdirectory(itircl) -#add_subdirectory(itss) -#add_subdirectory(jscript) +add_subdirectory(itss) +add_subdirectory(jscript) add_subdirectory(kernel32) add_subdirectory(loadperf) add_subdirectory(localspl) @@ -89,8 +89,8 @@ add_subdirectory(msg711.acm) add_subdirectory(msgina) add_subdirectory(msgsm32.acm) -#add_subdirectory(mshtml) -#add_subdirectory(mshtml.tlb) +add_subdirectory(mshtml) +add_subdirectory(mshtml.tlb) #add_subdirectory(msi) add_subdirectory(msimg32) add_subdirectory(msimtf) @@ -107,7 +107,7 @@ add_subdirectory(msvfw32) add_subdirectory(msvidc32) add_subdirectory(mswsock) -#add_subdirectory(msxml3) +add_subdirectory(msxml3) add_subdirectory(nddeapi) add_subdirectory(netapi32) add_subdirectory(netcfgx) @@ -136,7 +136,7 @@ add_subdirectory(powrprof) add_subdirectory(printui) add_subdirectory(psapi) -#add_subdirectory(pstorec) +add_subdirectory(pstorec) #add_subdirectory(qmgr) #add_subdirectory(qmgrprxy) add_subdirectory(query) @@ -162,7 +162,7 @@ add_subdirectory(sfc) add_subdirectory(sfc_os) add_subdirectory(shdoclc) -#add_subdirectory(shdocvw) +add_subdirectory(shdocvw) add_subdirectory(shell32) add_subdirectory(shfolder) add_subdirectory(shimgvw) @@ -174,9 +174,9 @@ add_subdirectory(softpub) add_subdirectory(spoolss) add_subdirectory(srclient) -#add_subdirectory(stdole2.tlb) -#add_subdirectory(stdole32.tlb) -#add_subdirectory(sti) +add_subdirectory(stdole2.tlb) +add_subdirectory(stdole32.tlb) +add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(syssetup) add_subdirectory(t2embed) @@ -199,7 +199,7 @@ add_subdirectory(version) add_subdirectory(wdmaud.drv) add_subdirectory(windowscodecs) -#add_subdirectory(winemp3.acm)# FIXME +#add_subdirectory(winemp3.acm)#FIXME: ertr000001.o:(.rdata+0x0): undefined reference to `_pei386_runtime_relocator)' add_subdirectory(winfax) add_subdirectory(wing32) add_subdirectory(winhttp)
Added: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprxy... ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,42 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(actxprxy ${CMAKE_CURRENT_SOURCE_DIR}/actxprxy.spec ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) + +add_library(actxprxy SHARED usrmarshal.c) + +set_entrypoint(actxprxy 0) + +target_link_libraries(actxprxy + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def + actxprxy_proxy + uuid + wine + pseh) + +add_importlibs(actxprxy + rpcrt4 + ole32 + oleaut32 + kernel32 + ntdll) + +add_dependencies(actxprxy actxprxy_def) + +add_definitions(-DREGISTER_PROXY_DLL -DPROXY_DELEGATION) + +rpcproxy(actxprxy + actxprxy_activscp.idl + actxprxy_comcat.idl + actxprxy_docobj.idl + actxprxy_hlink.idl + actxprxy_htiframe.idl + actxprxy_objsafe.idl + actxprxy_ocmm.idl + actxprxy_servprov.idl + actxprxy_shobjidl.idl + actxprxy_urlhist.idl) + +add_livecd_target(actxprxy reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,37 @@ + +ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl) + +add_definitions(-D__WINESRC__) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(atl ${CMAKE_CURRENT_SOURCE_DIR}/atl.spec ${CMAKE_CURRENT_BINARY_DIR}/atl.def) + +add_library(atl SHARED + atl_ax.c + atl_main.c + registrar.c + rsrc.rc) + +set_module_type(atl win32dll) + +target_link_libraries(atl + ${CMAKE_CURRENT_BINARY_DIR}/atl.def + uuid + wine) + +add_importlibs(atl + msvcrt + ole32 + oleaut32 + user32 + advapi32 + gdi32 + kernel32 + ntdll) + +add_dependencies(atl atl_atliface_header atl_def) +add_livecd_target(atl reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -12,7 +12,7 @@
spec2def(glu32 ${CMAKE_CURRENT_SOURCE_DIR}/glu32.spec ${CMAKE_CURRENT_BINARY_DIR}/glu32.def)
-list(APPEND SOURCE +add_library(glu32 SHARED libnurbs/interface/bezierEval.cc libnurbs/interface/bezierPatch.cc libnurbs/interface/bezierPatchMesh.cc @@ -103,12 +103,11 @@ libutil/quad.c libutil/registry.c)
-add_library(glu32 SHARED ${SOURCE}) - set_entrypoint(glu32 0)
target_link_libraries(glu32 ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) -add_importlibs(glu32 +add_importlibs( + glu32 gcc msvcrt opengl32 @@ -116,5 +115,5 @@ kernel32 ntdll)
-add_dependencies(glu32 glu32_def psdk buildno_header) +add_dependencies(glu32 glu32_def) add_livecd_target(glu32 reactos/system32)
Added: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.o... ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,37 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(hhctrl ${CMAKE_CURRENT_SOURCE_DIR}/hhctrl.ocx.spec ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def) + +add_library(hhctrl SHARED + chm.c + content.c + help.c + hhctrl.c + index.c + regsvr.c + search.c + stream.c + webbrowser.c + hhctrl.rc) + +set_module_type(hhctrl win32ocx) + +target_link_libraries(hhctrl + ${CMAKE_CURRENT_BINARY_DIR}/hhctrl.def + uuid + wine) + +add_importlibs(hhctrl + advapi32 + comctl32 + shlwapi + ole32 + oleaut32 + user32 + gdi32 + kernel32 + ntdll) + +add_dependencies(hhctrl hhctrl_def)
Propchange: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iprtprio... ============================================================================== --- branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,17 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(itircl ${CMAKE_CURRENT_SOURCE_DIR}/itircl.spec ${CMAKE_CURRENT_BINARY_DIR}/itircl.def) + +add_library(itircl SHARED itircl_main.c) + +set_module_type(itircl win32dll) + +target_link_libraries(itircl + ${CMAKE_CURRENT_BINARY_DIR}/itircl.def + wine) + +add_importlibs(itircl kernel32 ntdll) +add_dependencies(itircl itircl_def psdk) +add_livecd_target(itircl reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/iprtprio/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/itss/CMa... ============================================================================== --- branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/itss/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,6 +1,5 @@
-add_definitions(-D__WINESRC__) -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D__WINESRC__ -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(itss ${CMAKE_CURRENT_SOURCE_DIR}/itss.spec ${CMAKE_CURRENT_BINARY_DIR}/itss.def) @@ -25,6 +24,7 @@ urlmon shlwapi ole32 + kernel32 ntdll)
add_dependencies(itss itss_def wineheaders)
Added: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript/... ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,54 @@ + +ADD_TYPELIB(jsglobal jsglobal.idl) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(jscript ${CMAKE_CURRENT_SOURCE_DIR}/jscript.spec ${CMAKE_CURRENT_BINARY_DIR}/jscript.def) + +add_library(jscript SHARED + activex.c + date.c + dispex.c + engine.c + error.c + jscript.c + jscript_main.c + jsutils.c + lex.c + parser.tab.c + math.c + number.c + object.c + regexp.c + string.c + array.c + bool.c + function.c + global.c + rsrc.rc) + +set_module_type(jscript win32dll) + +target_link_libraries(jscript + ${CMAKE_CURRENT_BINARY_DIR}/jscript.def + wine) + +add_importlibs(jscript + msvcrt + user32 + ole32 + oleaut32 + advapi32 + kernel32 + ntdll) + +add_dependencies(jscript jsglobal jscript_def) +add_livecd_target(jscript reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.t... ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,24 @@ + +ADD_TYPELIB(mshtml_tlb mshtml_tlb.idl) +add_dependencies(mshtml_tlb stdole2) + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.tlb.spec --filename mshtml.tlb + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def PROPERTIES GENERATED TRUE) +add_custom_target(mshtml.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def) + +add_library(mshtml.tlb SHARED rsrc.rc) + +set_entrypoint(mshtml.tlb 0) +set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") + +target_link_libraries(mshtml.tlb ${CMAKE_CURRENT_BINARY_DIR}/mshtml.tlb.def) + +add_dependencies(mshtml.tlb mshtml_tlb mshtml.tlb_def) +add_livecd_target(mshtml.tlb reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/C... ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,103 @@ + +ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D__WINESRC__ + -D_DLL + -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(mshtml ${CMAKE_CURRENT_SOURCE_DIR}/mshtml.spec ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def) + +add_library(mshtml SHARED + conpoint.c + dispex.c + editor.c + hlink.c + htmlanchor.c + htmlbody.c + htmlcomment.c + htmlcurstyle.c + htmldoc.c + htmldoc3.c + htmldoc5.c + htmlelem.c + htmlelem2.c + htmlelem3.c + htmlelemcol.c + htmlevent.c + htmlform.c + htmlframe.c + htmlframebase.c + htmlgeneric.c + htmliframe.c + htmlimg.c + htmlinput.c + htmllocation.c + htmlnode.c + htmloption.c + htmlscreen.c + htmlscript.c + htmlselect.c + htmlstyle.c + htmlstyle2.c + htmlstyle3.c + htmlstylesheet.c + htmltable.c + htmltablerow.c + htmltextarea.c + htmltextcont.c + htmltextnode.c + htmlwindow.c + install.c + loadopts.c + main.c + mutation.c + navigate.c + nsembed.c + nsevents.c + nsio.c + nsservice.c + olecmd.c + oleobj.c + olewnd.c + omnavigator.c + persist.c + protocol.c + script.c + secmgr.c + selection.c + service.c + task.c + txtrange.c + view.c + rsrc.rc) + +set_module_type(mshtml win32dll) + +target_link_libraries(mshtml + ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def + uuid + wine + strmiids + oldnames) + +add_importlibs(mshtml +# msvcrt + urlmon + shlwapi + ole32 + oleaut32 + user32 + gdi32 + advapi32 + wininet + kernel32 + ntdll) + +add_dependencies(mshtml mshtml_nsiface_header mshtml_def) +add_livecd_target(mshtml reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/C... ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,26 +1,80 @@ + +ADD_TYPELIB(msxml3_v1 msxml3_v1.idl) +add_dependencies(msxml3_v1 stdole2)
remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_WIN32_WINNT=0x601)
-add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions( + -D__WINESRC__ + -D_WINE + -DLIBXML_STATIC + -D_DLL + -D__USE_CRTIMP)
-spec2def(netcfgx ${CMAKE_CURRENT_SOURCE_DIR}/netcfgx.spec ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) +if(MSVC) +add_definitions(/FIwine/typeof.h) +endif(MSVC)
-add_library(netcfgx SHARED - netcfgx.c - classfactory.c - netcfg_iface.c - inetcfgcomp_iface.c - tcpipconf_notify.c - netcfgx.rc) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-set_module_type(netcfgx win32dll) +spec2def(msxml3 ${CMAKE_CURRENT_SOURCE_DIR}/msxml3.spec ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def)
-target_link_libraries(netcfgx - ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def +add_library(msxml3 SHARED + attribute.c + comment.c + domdoc.c + element.c + factory.c + main.c + httprequest.c + node.c + nodelist.c + nodemap.c + parseerror.c + pi.c + queryresult.c + regsvr.c + schema.c + text.c + uuid.c + xmldoc.c + xmlelem.c + saxreader.c + bsc.c + cdata.c + dispex.c + docfrag.c + domimpl.c + entityref.c + version.rc) + +set_module_type(msxml3 win32dll) + +target_link_libraries(msxml3 + ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def + libxml2 uuid - wine) + wine + wineldr)
-add_importlibs(netcfgx rpcrt4 setupapi advapi32 iphlpapi ole32 user32 comctl32 ws2_32 ntdll) -add_dependencies(netcfgx netcfgx_def) +add_importlibs(msxml3 + msvcrt + urlmon + wininet + ws2_32 + comctl32 + shell32 + shlwapi + cabinet + oleaut32 + ole32 + version + user32 + gdi32 + advapi32 + kernel32 + ntdll) + +add_dependencies(msxml3 msxml3_v1 msxml3_def) add_livecd_target(msxml3 reactos/system32)
Added: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec/... ============================================================================== --- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,21 @@ + +ADD_TYPELIB(pstorec_tlb pstorec_tlb.idl) +add_dependencies(pstorec_tlb stdole2) + +add_definitions(-D__WINESRC__) + +spec2def(pstorec ${CMAKE_CURRENT_SOURCE_DIR}/pstorec.spec ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) + +add_library(pstorec SHARED pstorec.c rsrc.rc) + +set_module_type(pstorec win32dll) + +target_link_libraries(pstorec + ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def + uuid + wine) + +add_importlibs(pstorec msvcrt kernel32 ntdll) + +add_dependencies(pstorec pstorec_tlb pstorec_def) +add_livecd_target(pstorec reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw/... ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,53 @@ + +ADD_TYPELIB(shdocvw_v1 shdocvw_v1.idl) +add_dependencies(shdocvw_v1 stdole2) + +add_definitions(-D_SHDOCVW_) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(shdocvw ${CMAKE_CURRENT_SOURCE_DIR}/shdocvw.spec ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def) + +add_library(shdocvw SHARED + classinfo.c + client.c + dochost.c + events.c + factory.c + frame.c + ie.c + iexplore.c + intshcut.c + navigate.c + oleobject.c + persist.c + shdocvw_main.c + shlinstobj.c + taskbarlist.c + urlhist.c + view.c + webbrowser.c + shdocvw.rc) + +set_module_type(shdocvw win32dll) + +target_link_libraries(shdocvw + ${CMAKE_CURRENT_BINARY_DIR}/shdocvw.def + uuid + wine) + +add_importlibs(shdocvw + ole32 + oleaut32 + shlwapi + shell32 + user32 + advapi32 + gdi32 + version + urlmon + kernel32 + ntdll) + +add_dependencies(shdocvw shdocvw_v1 shdocvw_def) +add_livecd_target(shdocvw reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw/... ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/En.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/En.rc [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -38,7 +38,7 @@ { POPUP "&New" { - MENUITEM "&Window" ID_BROWSE_NEW_WINDOW + MENUITEM "&Window", ID_BROWSE_NEW_WINDOW } MENUITEM "&Open...", ID_BROWSE_OPEN MENUITEM "&Save", ID_BROWSE_SAVE
Added: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2.... ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +ADD_TYPELIB(std_ole_v2 std_ole_v2.idl) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/stdole2.tlb.spec --filename stdole2.tlb + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def PROPERTIES GENERATED TRUE) +add_custom_target(stdole2.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def) + +add_library(stdole2.tlb SHARED rsrc.rc) + +set_entrypoint(stdole2.tlb 0) +set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") + +target_link_libraries(stdole2.tlb ${CMAKE_CURRENT_BINARY_DIR}/stdole2.tlb.def) + +add_dependencies(stdole2.tlb std_ole_v2 stdole2.tlb_def) +add_livecd_target(stdole2.tlb reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole32... ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,0 +1,23 @@ + +add_definitions(-D__WINESRC__) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +ADD_TYPELIB(std_ole_v1 std_ole_v1.idl) + +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def + COMMAND native-winebuild -o ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def --def -E ${CMAKE_CURRENT_SOURCE_DIR}/stdole32.tlb.spec --filename stdole32.tlb + DEPENDS native-winebuild) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def PROPERTIES GENERATED TRUE) +add_custom_target(stdole32.tlb_def ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def) + +add_library(stdole32.tlb SHARED rsrc.rc) + +set_entrypoint(stdole32.tlb 0) +set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") + +target_link_libraries(stdole32.tlb ${CMAKE_CURRENT_BINARY_DIR}/stdole32.tlb.def) + +add_dependencies(stdole32.tlb std_ole_v1 stdole32.tlb_def) +add_livecd_target(stdole32.tlb reactos/system32)
Propchange: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -15,7 +15,8 @@ add_library(sti SHARED regsvr.c sti.c - sti_main.c) + sti_main.c + sti_wia.idl)
set_entrypoint(sti 0)
@@ -35,3 +36,6 @@ ntdll)
add_dependencies(sti sti_def) + +rpcproxy(sti sti_wia.idl) +add_livecd_target(sti reactos/system32)
Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3.... ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -21,7 +21,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/winemp3.acm.def mingw_common wine - mpg123) + libmpg123)
-add_importlibs(winemp3.acm msvcrt winmm user32) +add_importlibs(winemp3.acm + msvcrt + winmm + user32 + kernel32 + ntdll) + add_dependencies(winemp3.acm winemp3.acm_def psdk)
Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/wi... ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,3 +1,6 @@ + +ADD_INTERFACE_DEFINITIONS(wineheaders itss.idl wined3d.idl) + list(APPEND SOURCE epm.idl irot.idl)
Modified: branches/cmake-bringup/lib/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/atl/CMakeLists... ============================================================================== --- branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/atl/CMakeLists.txt [iso-8859-1] Thu Oct 28 11:33:02 2010 @@ -1,7 +1,5 @@ - -file(GLOB_RECURSE SOURCE "*.cpp")
add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DROS_Headers)
-add_library(atl ${SOURCE}) +add_library(atlnew atlbase.cpp atlcore.cpp)
-
akhaldi＠svn.reactos.org