[ros-diffs] [akhaldi] 48535: [CMAKE] - Add calc to build.

Author: akhaldi
Date: Fri Aug 13 16:55:07 2010
New Revision: 48535

URL: http://svn.reactos.org/svn/reactos?rev=48535&view=rev
Log:
[CMAKE]
- Add calc to build.

Added:
    branches/cmake-bringup/base/applications/calc/CMakeLists.txt   (with props)
Modified:
    branches/cmake-bringup/base/CMakeLists.txt
    branches/cmake-bringup/base/applications/CMakeLists.txt

Modified: branches/cmake-bringup/base/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/CMakeLists.t…
==============================================================================
--- branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/CMakeLists.txt [iso-8859-1] Fri Aug 13 16:55:07 2010
@@ -1,5 +1,5 @@
 
-#add_subdirectory(applications)
+add_subdirectory(applications)
 #add_subdirectory(services)
 #add_subdirectory(setup)
 #add_subdirectory(shell)

Modified: branches/cmake-bringup/base/applications/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/CMakeLists.txt [iso-8859-1] Fri Aug 13
16:55:07 2010
@@ -1,6 +1,6 @@
 
 #add_subdirectory(cacls)
-#add_subdirectory(calc)
+add_subdirectory(calc)
 #add_subdirectory(charmap)
 #add_subdirectory(cmdutils)
 #add_subdirectory(control)

Added: branches/cmake-bringup/base/applications/calc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/calc/CMakeLists.txt (added)
+++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Fri Aug 13
16:55:07 2010
@@ -1,0 +1,23 @@
+
+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,_WinMainCRTStartup
-Wl,--enable-stdcall-fixup -Wl,--enable-auto-image-base -Wl,--kill-at
-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
+
+add_definitions(-DUNICODE -D_UNICODE)
+add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
+
+file(GLOB_RECURSE SOURCE *.c)
+list(REMOVE_ITEM SOURCE
+     ${CMAKE_CURRENT_SOURCE_DIR}/fun_mpfr.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/rpn_mpfr.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/utl_mpfr.c)
+
+add_executable(calc WIN32 ${SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/resource.rc)
+
+target_link_libraries(calc mingw_wmain
+                      ${REACTOS_SOURCE_DIR}/dll/win32/advapi32/libadvapi32.a
+                      ${REACTOS_SOURCE_DIR}/dll/win32/user32/libuser32.a
+                      ${REACTOS_SOURCE_DIR}/dll/win32/gdi32/libgdi32.a
+                      mingw_common
+                      -lmsvcrt)
+
+add_dependencies(calc psdk)

Propchange: branches/cmake-bringup/base/applications/calc/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native