[ros-diffs] [jgardou] 53120: [RPCRT4] - Hack cmake build file to get wininet.dll delay importing. msvc build reactos now gets as far as showing 2nd stage setup wizard. Mouse/keyboard don't respond yet.

jgardou at svn.reactos.org jgardou at svn.reactos.org
Sun Aug 7 17:26:49 UTC 2011


Author: jgardou
Date: Sun Aug  7 17:26:49 2011
New Revision: 53120

URL: http://svn.reactos.org/svn/reactos?rev=53120&view=rev
Log:
[RPCRT4]
- Hack cmake build file to get wininet.dll delay importing.
msvc build reactos now gets as far as showing 2nd stage setup wizard.
Mouse/keyboard don't respond yet.

Modified:
    trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt

Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt?rev=53120&r1=53119&r2=53120&view=diff
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Sun Aug  7 17:26:49 2011
@@ -1,5 +1,11 @@
 
 add_rpc_files(client epm.idl)
+
+# HACK!!!!!!
+if(MSVC)
+    set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo <DEFINES> /Fo<OBJECT> /Fd<TARGET_PDB> -c <SOURCE> <FLAGS>")
+    set_source_files_properties(rpc_transport.c PROPERTIES COMPILE_FLAGS "/link /DELAYLOAD:wininet.dll")
+endif()
 
 list(APPEND SOURCE
     cproxy.c
@@ -50,8 +56,16 @@
     wine
     uuid
     ${PSEH_LIB})
+    
+if(NOT MSVC)
+    add_delay_importlibs(rpcrt4 wininet)
+else()
+    add_importlibs(rpcrt4 wininet)
+    add_linkerflag(rpcrt4 "/DELAYLOAD:wininet.dll")
+    target_link_libraries(rpcrt4 delayimp)
+endif()
+    
 
 add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll)
-add_delay_importlibs(rpcrt4 wininet)
 add_cd_file(TARGET rpcrt4 DESTINATION reactos/system32 FOR all)
 add_importlib_target(rpcrt4.spec)




More information about the Ros-diffs mailing list