[CMAKE]

  - add fontview to build
  - add experimental solitaire build file

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

diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt
index e547be5..557e5fa 100644 (file)
--- a/base/applications/CMakeLists.txt
+++ b/base/applications/CMakeLists.txt
@@ -6,8 +6,8 @@ add_subdirectory(cmdutils)
 add_subdirectory(control)
 #add_subdirectory(dxdiag)
 add_subdirectory(extrac32)
-#add_subdirectory(fontview)
-#add_subdirectory(games)
+add_subdirectory(fontview)
+add_subdirectory(games)
 #add_subdirectory(hh)
 #add_subdirectory(iexplore)
 #add_subdirectory(kbswitch)

diff --git a/base/applications/fontview/CMakeLists.txt b/base/applications/fontview/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f2557f8
--- /dev/null
+++ b/base/applications/fontview/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+add_executable(fontview
+    display.c
+    fontview.c
+    fontview.rc)
+
+set_unicode(fontview no)
+
+set_module_type(fontview win32gui)
+
+add_importlibs(fontview gdi32 shell32 user32 msvcrt)
\ No newline at end of file

diff --git a/base/applications/games/CMakeLists.txt b/base/applications/games/CMakeLists.txt
index caf7e35..bde2267 100644 (file)
--- a/base/applications/games/CMakeLists.txt
+++ b/base/applications/games/CMakeLists.txt
@@ -1,4 +1,4 @@
 
-#add_subdirectory(solitaire)
+add_subdirectory(solitaire)
 #add_subdirectory(spider)
 #add_subdirectory(winemine)

diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt
new file mode 100644 (file)
index 0000000..e41b503
--- /dev/null
+++ b/base/applications/games/solitaire/CMakeLists.txt
@@ -0,0 +1,16 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
+
+add_executable(sol
+    solcreate.cpp
+    solgame.cpp
+    solitaire.cpp
+    rsrc.rc)
+
+set_unicode(sol yes)
+
+set_module_type(sol win32gui)
+
+target_link_libraries(sol cardlib)
+
+add_importlibs(sol advapi32 comctl32 user32 gdi32 stdc++ gcc mingw32 msvcrt)
\ No newline at end of file