[CMAKE]

- Add calc to build.

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

diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index 12fe71a..0363edb 100644 (file)
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-#add_subdirectory(applications)
+add_subdirectory(applications)
 #add_subdirectory(services)
 #add_subdirectory(setup)
 #add_subdirectory(shell)

diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt
index 94266aa..d8308db 100644 (file)
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 #add_subdirectory(cacls)
-#add_subdirectory(calc)
+add_subdirectory(calc)
 #add_subdirectory(charmap)
 #add_subdirectory(cmdutils)
 #add_subdirectory(control)

diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8974fb2
--- /dev/null
+++ b/base/applications/calc/CMakeLists.txt
@@ -0,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)