[ros-diffs] [akhaldi] 49068: [CMAKE] - Bring back explorer.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Sat Oct  9 12:48:57 2010
New Revision: 49068

URL: http://svn.reactos.org/svn/reactos?rev=49068&view=rev
Log:
[CMAKE]
- Bring back explorer.

Modified:
    branches/cmake-bringup/base/shell/CMakeLists.txt
    branches/cmake-bringup/base/shell/explorer/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
    branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt

Modified: branches/cmake-bringup/base/shell/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeLists.txt?rev=49068&r1=49067&r2=49068&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Sat Oct  9 12:48:57 2010
@@ -1,4 +1,4 @@
 
 add_subdirectory(cmd)
-#add_subdirectory(explorer)
+add_subdirectory(explorer)
 add_subdirectory(explorer-new)

Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explorer/CMakeLists.txt?rev=49068&r1=49067&r2=49068&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sat Oct  9 12:48:57 2010
@@ -45,24 +45,33 @@
     utility/window.cpp
     utility/shellbrowserimpl.cpp) #    utility/shelltests.cpp
 
-
 add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE})
 
+set_subsystem(explorer windows)
+set_entrypoint(explorer WinMainCRTStartup)
+
 target_link_libraries(explorer
+    -lsupc++
+    -lstdc++
+    -lgcc
+    -lmingw32
+    -lmingwex
     wine
-    uuid)
+    mingw_wmain
+    mingw_common
+    uuid
+    -ladvapi32
+    -lgdi32
+    -luser32
+    -lws2_32
+    -lmsimg32
+    -lcomctl32
+    -lole32
+    -loleaut32
+    -lshell32
+    -lnotifyhook
+    -lmsvcrt
+    -lkernel32
+    -lntdll)
 
-set_module_type(explorer win32gui)
-
-add_importlibs(explorer 
-    advapi32
-    gdi32
-    user32
-    ws2_32
-    msimg32
-    comctl32
-    ole32
-    oleaut32
-    shell32
-    notifyhook
-    msvcrt)
+add_dependencies(explorer psdk buildno_header)

Modified: branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt?rev=49068&r1=49067&r2=49068&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sat Oct  9 12:48:57 2010
@@ -41,7 +41,7 @@
 add_library(mingw_common ${MINGW_COMMON_SOURCE})
 
 if(NOT MSVC)
-  add_dependencies(mingw_common oldnames)
+    target_link_libraries(mingw_common oldnames)
 endif(NOT MSVC)
 
 set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)

Modified: branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt?rev=49068&r1=49067&r2=49068&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/stlport/CMakeLists.txt [iso-8859-1] Sat Oct  9 12:48:57 2010
@@ -44,6 +44,6 @@
 
 if(NOT MSVC)
   #those are mandatory to get correctly ordered linked libraries.
-  target_link_libraries(stlport supc++ msvcrt.dll.a)
-  add_importlibs(stlport msvcrt)
+  #target_link_libraries(stlport supc++ msvcrt.dll.a)
+  #add_importlibs(stlport msvcrt)
 endif()