From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 4 Oct 2010 22:06:46 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~770
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a5f513fed5a22cf5599166fb821a3d969f1f5748

[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 09fc0fba246..bd375ff1c43 100644
--- 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 a559af78948..14e10d68e07 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -11,7 +11,8 @@ else()
 link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)
 set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
 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>")
-set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
+set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at")
+# -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
 
 # Compiler Core
 add_definitions(-pipe -fms-extensions)
@@ -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>")
 
 # Debugging (Note: DWARF-4 on 4.5.1 when we ship)
-add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)
+#add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)
 
 # Tuning
 add_definitions(-march=pentium -mtune=i686)