[ros-diffs] [akhaldi] 48983: [CMAKE] - Disable emitting debug info and applying the linker script for now. - Enable explorer build.

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Mon Oct  4 22:06:46 2010
New Revision: 48983

URL: http://svn.reactos.org/svn/reactos?rev=48983&view=rev
Log:
[CMAKE]
- Disable emitting debug info and applying the linker script for now.
- Enable explorer build.

Modified:
    branches/cmake-bringup/base/shell/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake

Modified: branches/cmake-bringup/base/shell/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeLists.txt?rev=48983&r1=48982&r2=48983&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Mon Oct  4 22:06:46 2010
@@ -1,4 +1,4 @@
 
 add_subdirectory(cmd)
-#add_subdirectory(explorer)
+add_subdirectory(explorer)
 #add_subdirectory(explorer_new)

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=48983&r1=48982&r2=48983&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Oct  4 22:06:46 2010
@@ -11,7 +11,8 @@
 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_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)