[CMAKE]

* Remove inflib from build. It's been superseded by newinflib.
* Rename newinflibhost and newinflib targets into inflibhost and inflib respectively.
* Update mkhive and usetup to link to the new targets.

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

diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt
index 14a37e2..269fd74 100644 (file)
--- a/base/setup/usetup/CMakeLists.txt
+++ b/base/setup/usetup/CMakeLists.txt
@@ -33,7 +33,7 @@ add_executable(usetup
 target_link_libraries(usetup
     mingw_main
     zlib
-    newinflib
+    inflib
     ext2lib
     vfatlib
     mingw_common)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4c0d7c6..e1f8fd7 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 add_subdirectory(cmlib)
-add_subdirectory(inflib)
 add_subdirectory(newinflib)
 
 if(CMAKE_CROSSCOMPILING)

diff --git a/lib/newinflib/CMakeLists.txt b/lib/newinflib/CMakeLists.txt
index e178d0d..901bd99 100644 (file)
--- a/lib/newinflib/CMakeLists.txt
+++ b/lib/newinflib/CMakeLists.txt
@@ -1,16 +1,28 @@
 
-set(GLOBAL_FILES infcore.c infget.c infput.c)
+list(APPEND GLOBAL_FILES
+    infcore.c
+    infget.c
+    infput.c)
 
 if(CMAKE_CROSSCOMPILING)
-    file(GLOB_RECURSE SOURCE "infros*.c")
-    add_library(newinflib ${GLOBAL_FILES} ${SOURCE})
-    add_dependencies(newinflib psdk)
+    list(APPEND SOURCE 
+        infrosgen.c
+        infrosget.c
+        infrosput.c)
+
+    add_library(inflib ${GLOBAL_FILES} ${SOURCE})
+    add_dependencies(inflib psdk)
 else()
-    file(GLOB_RECURSE SOURCE "infhost*.c")
+    list(APPEND SOURCE 
+        infhostgen.c
+        infhostget.c
+        infhostput.c
+        infhostrtl.c)
+
     add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS)
     if(NOT MSVC)
         add_definitions(-Wpointer-arith -Wwrite-strings)
     endif()
-    add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE})
-    target_link_libraries(newinflibhost unicode)
+    add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
+    target_link_libraries(inflibhost unicode)
 endif()