[CMAKE]

- Disable emitting debug info and applying the linker script for now.
- Enable explorer build.

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

diff --git a/base/shell/CMakeLists.txt b/base/shell/CMakeLists.txt
index 09fc0fb..bd375ff 100644 (file)
--- a/base/shell/CMakeLists.txt
+++ b/base/shell/CMakeLists.txt
@@ -1,4 +1,4 @@
 
 add_subdirectory(cmd)
-#add_subdirectory(explorer)
+add_subdirectory(explorer)
 #add_subdirectory(explorer_new)

diff --git a/gcc.cmake b/gcc.cmake
index a559af7..14e10d6 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -11,7 +11,8 @@ else()
 link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)\r
 set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")\r
 set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -lstdc++ -lsupc++ -lgcc -lmingwex -lmingw32 <LINK_LIBRARIES>")\r
-set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")\r
+set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at")\r
+# -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds\r
 \r
 # Compiler Core\r
 add_definitions(-pipe -fms-extensions)\r
@@ -21,7 +22,7 @@ set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FL
 set(CMAKE_RC_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")\r
 \r
 # Debugging (Note: DWARF-4 on 4.5.1 when we ship)\r
-add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)\r
+#add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)\r
 \r
 # Tuning\r
 add_definitions(-march=pentium -mtune=i686)\r