Author: akhaldi
Date: Fri Apr 15 22:49:50 2011
New Revision: 51362
URL: http://svn.reactos.org/svn/reactos?rev=51362&view=rev
Log:
[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.
Modified:
branches/cmake-bringup/base/setup/usetup/CMakeLists.txt
branches/cmake-bringup/lib/CMakeLists.txt
branches/cmake-bringup/lib/newinflib/CMakeLists.txt
branches/cmake-bringup/tools/mkhive/CMakeLists.txt
Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup/CMakeLists.txt?rev=51362&r1=51361&r2=51362&view=diff
==============================================================================
--- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri
Apr 15 22:49:50 2011
@@ -33,7 +33,7 @@
target_link_libraries(usetup
mingw_main
zlib
- newinflib
+ inflib
ext2lib
vfatlib
mingw_common)
Modified: branches/cmake-bringup/lib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.txt?rev=51362&r1=51361&r2=51362&view=diff
==============================================================================
--- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Fri Apr 15 22:49:50
2011
@@ -1,6 +1,5 @@
add_subdirectory(cmlib)
-add_subdirectory(inflib)
add_subdirectory(newinflib)
if(CMAKE_CROSSCOMPILING)
Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMakeLists.txt?rev=51362&r1=51361&r2=51362&view=diff
==============================================================================
--- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Fri Apr 15
22:49:50 2011
@@ -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()
Modified: branches/cmake-bringup/tools/mkhive/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/mkhive/CMakeLists.txt?rev=51362&r1=51361&r2=51362&view=diff
==============================================================================
--- branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] Fri Apr 15
22:49:50 2011
@@ -17,4 +17,4 @@
rtl.c)
add_executable(mkhive ${SOURCE})
-target_link_libraries(mkhive unicode cmlibhost newinflibhost)
+target_link_libraries(mkhive unicode cmlibhost inflibhost)
