[CMAKE]

- Bring back explorer.

svn path=/branches/cmake-bringup/; revision=49068

diff --git a/base/shell/CMakeLists.txt b/base/shell/CMakeLists.txt
index 9563884..dc06a56 100644 (file)
--- a/base/shell/CMakeLists.txt
+++ b/base/shell/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_subdirectory(cmd)
 
 add_subdirectory(cmd)

-#add_subdirectory(explorer)
+add_subdirectory(explorer)

 add_subdirectory(explorer-new)
 add_subdirectory(explorer-new)

diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt
index 54594c1..9133234 100644 (file)
--- a/base/shell/explorer/CMakeLists.txt
+++ b/base/shell/explorer/CMakeLists.txt
@@ -45,24 +45,33 @@ list(APPEND SOURCE
     utility/window.cpp
     utility/shellbrowserimpl.cpp) #    utility/shelltests.cpp
 
     utility/window.cpp
     utility/shellbrowserimpl.cpp) #    utility/shelltests.cpp
 

-

 add_executable(explorer ${SOURCE}) #${CMAKE_CURRENT_BINARY_DIR}/explorer_precomp.h.gch ${SOURCE})
 
 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
 target_link_libraries(explorer

+    -lsupc++
+    -lstdc++
+    -lgcc
+    -lmingw32
+    -lmingwex

     wine
     wine

-    uuid)
-
-set_module_type(explorer win32gui)
+    mingw_wmain
+    mingw_common
+    uuid
+    -ladvapi32
+    -lgdi32
+    -luser32
+    -lws2_32
+    -lmsimg32
+    -lcomctl32
+    -lole32
+    -loleaut32
+    -lshell32
+    -lnotifyhook
+    -lmsvcrt
+    -lkernel32
+    -lntdll)

 
 

-add_importlibs(explorer 
-    advapi32
-    gdi32
-    user32
-    ws2_32
-    msimg32
-    comctl32
-    ole32
-    oleaut32
-    shell32
-    notifyhook
-    msvcrt)
+add_dependencies(explorer psdk buildno_header)

diff --git a/lib/3rdparty/mingw/CMakeLists.txt b/lib/3rdparty/mingw/CMakeLists.txt
index e6f4a97..8390d6c 100644 (file)
--- a/lib/3rdparty/mingw/CMakeLists.txt
+++ b/lib/3rdparty/mingw/CMakeLists.txt
@@ -41,7 +41,7 @@ list(APPEND MINGW_COMMON_SOURCE
 add_library(mingw_common ${MINGW_COMMON_SOURCE})
 
 if(NOT MSVC)
 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)
 endif(NOT MSVC)
 
 set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)

diff --git a/lib/3rdparty/stlport/CMakeLists.txt b/lib/3rdparty/stlport/CMakeLists.txt
index 1846047..4add3ff 100644 (file)
--- a/lib/3rdparty/stlport/CMakeLists.txt
+++ b/lib/3rdparty/stlport/CMakeLists.txt
@@ -44,6 +44,6 @@ add_library(stlport ${SOURCE})
 
 if(NOT MSVC)
   #those are mandatory to get correctly ordered linked libraries.
 
 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()
 endif()