Author: akhaldi
Date: Sun Sep 12 19:38:21 2010
New Revision: 48760
URL:
http://svn.reactos.org/svn/reactos?rev=48760&view=rev
Log:
[CMAKE]
- Fix usetup build.
Modified:
branches/cmake-bringup/base/setup/usetup/CMakeLists.txt
Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup…
==============================================================================
--- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Sun Sep 12
19:38:21 2010
@@ -1,6 +1,10 @@
set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS>
<CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET>
<LINK_LIBRARIES> -Wl,-L${REACTOS_BINARY_DIR}/lib/3rdparty/mingw")
set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,-entry,_NtProcessStartup
-Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at
-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib)
+include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
add_executable(usetup WIN32
interface/usetup.c
@@ -26,10 +30,13 @@
progress.c
registry.c
settings.c
-)
+ usetup.rc)
-include_directories(${REACTOS_SOURCE_DIR}/lib/newinflib)
-include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/zlib)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
-target_link_libraries(usetup mingw_main zlib newinflib ext2lib vfatlib
${REACTOS_SOURCE_DIR}/dll/ntdll/libntdll.a
- mingw_common -lmsvcrt)
+target_link_libraries(usetup
+ mingw_main
+ zlib
+ newinflib
+ ext2lib
+ vfatlib
+ mingw_common
+ -lmsvcrt)