[CMAKE]

Add idndl to build

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

diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt
index f249762..b36bbb7 100644 (file)
--- a/base/applications/cmdutils/CMakeLists.txt
+++ b/base/applications/cmdutils/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)

-add_subdirectory(find) # FIXME : lang/pt-BR.rc:6: use "" to put " in a string
+add_subdirectory(find)

 add_subdirectory(hostname)
 add_subdirectory(lodctr)
 add_subdirectory(more)
 add_subdirectory(hostname)
 add_subdirectory(lodctr)
 add_subdirectory(more)

diff --git a/dll/nls/CMakeLists.txt b/dll/nls/CMakeLists.txt
index 0cbc6f9..fbc21b3 100644 (file)
--- a/dll/nls/CMakeLists.txt
+++ b/dll/nls/CMakeLists.txt
@@ -1,3 +1,3 @@
 
 

-#add_subdirectory(idndl)#FIXME: idndl.cpp:20: error: 'GetLocaleInfoEx' was not declared in this scope
+add_subdirectory(idndl)

 add_subdirectory(normaliz)
 add_subdirectory(normaliz)

diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt
index cf684e6..94435b9 100644 (file)
--- a/dll/nls/idndl/CMakeLists.txt
+++ b/dll/nls/idndl/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 

-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
+remove_definitions(-DWINVER=0x502)
+add_definitions(-DWINVER=0x600)

 
 spec2def(idndl.dll idndl.spec)
 
 
 spec2def(idndl.dll idndl.spec)