[CMAKE]

- Delete an unneeded lib.mak
- Don't build bin2c, we don't seem to need it.
- A minor cleanup, no functionality change intended.

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

lib/3rdparty/mingw/CMakeLists.txt

@@ -5,7 +5,7 @@ add_definitions(-D_CRTBLD)
 
 if(NOT MSVC)
     add_definitions(-Wno-main)
-endif(NOT MSVC)
+endif()
 
 list(APPEND MINGW_COMMON_SOURCE
     _newmode.c
@@ -45,7 +45,7 @@ add_library(mingw_common ${MINGW_COMMON_SOURCE})
 
 if(NOT MSVC)
     target_link_libraries(mingw_common oldnames)
-endif(NOT MSVC)
+endif()
 
 set_target_properties(mingw_common PROPERTIES COMPILE_DEFINITIONS _M_CEE_PURE)
 add_dependencies(mingw_common psdk)

lib/atl/CMakeLists.txt

@@ -1,5 +1,6 @@
 
-add_definitions(-DUNICODE -D_UNICODE)
+add_definitions(
-add_definitions(-DROS_Headers)
+    -DUNICODE -D_UNICODE
+    -DROS_Headers)
 
 add_library(atlnew atlbase.cpp atlcore.cpp)

lib/inflib/CMakeLists.txt

@@ -1,20 +1,15 @@
 
-SET(GLOBAL_FILES infcore.c infget.c infput.c)
+set(GLOBAL_FILES infcore.c infget.c infput.c)
 
 if(CMAKE_CROSSCOMPILING)
-
     file(GLOB_RECURSE SOURCE "infros*.c")
     add_library(inflib ${GLOBAL_FILES} ${SOURCE})
     add_dependencies(inflib psdk)
-
 else()
-
     file(GLOB_RECURSE SOURCE "infhost*.c")
-
     add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST)
     if(NOT MSVC)
         add_definitions(-Wpointer-arith -Wconversion -Wstrict-prototypes -Wmissing-prototypes)
     endif()
     add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
-
 endif()

lib/lib.mak

@@ -1,7 +0,0 @@
-LIB_BASE = lib
-LIB_BASE_ = $(LIB_BASE)$(SEP)
-
-include lib/inflib/inflib.mak
-ifeq ($(ARCH),powerpc)
-include lib/ppcmmu/ppcmmu.mak
-endif

lib/newinflib/CMakeLists.txt

@@ -1,22 +1,16 @@
 
-SET(GLOBAL_FILES infcore.c infget.c infput.c)
+set(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)
-
 else()
-
     file(GLOB_RECURSE SOURCE "infhost*.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)
-
 endif()
-

lib/ppcmmu/CMakeLists.txt

@@ -2,8 +2,7 @@
 list(APPEND SOURCE dummy.c)
 
 if(ARCH MATCHES powerpc)
-list(APPEND SOURCE
+    list(APPEND SOURCE mmuutil.c)
-    mmuutil.c)
+endif()
-endif(ARCH MATCHES powerpc)
 
 add_library(ppcmmu ${SOURCE})

lib/pseh/CMakeLists.txt

@@ -2,7 +2,6 @@
 if(NOT MSVC)
 
     list(APPEND SOURCE framebased.c)
-
     if(ARCH MATCHES i386)
         list(APPEND SOURCE
             i386/framebased.S
@@ -12,7 +11,7 @@ elseif(ARCH MATCHES amd64)
         list(APPEND SOURCE amd64/framebased.S)
     elseif(ARCH MATCHES powerpc)
         list(APPEND SOURCE powerpc/framebased.S)
-endif(ARCH MATCHES i386)
+    endif()
 
     add_library(pseh ${SOURCE})
     add_dependencies(pseh psdk)

lib/rtl/CMakeLists.txt

@@ -96,9 +96,8 @@ list(APPEND SOURCE
         powerpc/rtlmem.s
         powerpc/rtlswap.s
         powerpc/thread.c)
-endif(ARCH MATCHES i386)
+endif()
 
 add_library(rtl ${CMAKE_CURRENT_BINARY_DIR}/rtl_rtl.h.gch ${SOURCE})
 add_pch(rtl ${CMAKE_CURRENT_SOURCE_DIR}/rtl.h ${SOURCE})
 add_dependencies(rtl psdk asm)
-

lib/smlib/CMakeLists.txt

@@ -1,3 +1,4 @@
+
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)

subsystems/win32/csrss/CMakeLists.txt

@@ -1,18 +1,16 @@
 
-include_directories(include)
+include_directories(
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+    include
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
 
 add_executable(csrss csrss.c csrss.rc)
 
 set_module_type(csrss nativecui)
-
 target_link_libraries(csrss nt)
-
 add_importlibs(csrss ntdll csrsrv)
-
 add_dependencies(csrss psdk bugcodes)
+add_cab_target(csrss 1)
 
 add_subdirectory(csrsrv)
 add_subdirectory(win32csr)
-add_cab_target(csrss 1)

subsystems/win32/win32k/CMakeLists.txt

@@ -173,7 +173,7 @@ else()
 list(APPEND SOURCE
     dib/dib24bppc.c
     dib/dib32bppc.c)
-endif(ARCH MATCHES i386)
+endif()
 
 add_library(win32k SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/win32k_pch.h.gch
@@ -192,4 +192,3 @@ add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE})
 add_dependencies(win32k gendib_generated subsystem_napi)
 add_cab_target(win32k 1)
 add_importlib_target(win32k.spec win32k.sys)
-