[ros-diffs] [akhaldi] 49509: [CMAKE] - Add a preprocessed definition file for acledit. - Add the pdef2def macro. - Include wpp into build, widl links to it. - Fix libmpg123.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Sat Nov 6 11:31:39 UTC 2010


Author: akhaldi
Date: Sat Nov  6 11:31:38 2010
New Revision: 49509

URL: http://svn.reactos.org/svn/reactos?rev=49509&view=rev
Log:
[CMAKE]
- Add a preprocessed definition file for acledit.
- Add the pdef2def macro.
- Include wpp into build, widl links to it.
- Fix libmpg123.

Modified:
    branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake
    branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
    branches/cmake-bringup/msc.cmake
    branches/cmake-bringup/tools/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt?rev=49509&r1=49508&r2=49509&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sat Nov  6 11:31:38 2010
@@ -1,14 +1,16 @@
 
 set_unicode()
+
+pdef2def(acledit.pdef)
 
 list(APPEND SOURCE
     acledit.c
     stubs.c
     acledit.rc
-    acledit.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/acledit.def)
 
 if(NOT MSVC)
-    set_source_files_properties(acledit.def PROPERTIES EXTERNAL_OBJECT TRUE)
+    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/acledit.def PROPERTIES EXTERNAL_OBJECT TRUE)
 endif()
 
 add_library(acledit SHARED ${SOURCE})

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=49509&r1=49508&r2=49509&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sat Nov  6 11:31:38 2010
@@ -159,6 +159,16 @@
   # empty for now, while import libs are shipped
 endmacro()
 
+macro(pdef2def _pdef_file)
+    get_filename_component(_file ${_pdef_file} NAME_WE)
+    add_custom_command(
+        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        COMMAND ${MINGW_PREFIX}cpp -o ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -P -E ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file}
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_pdef_file})
+    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_file}.def
+        PROPERTIES GENERATED TRUE EXTERNAL_OBJECT TRUE)
+endmacro(pdef2def _pdef_file)
+
 #pseh lib, needed with mingw
 set(PSEH_LIB "pseh")
 

Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt?rev=49509&r1=49508&r2=49509&view=diff
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Sat Nov  6 11:31:38 2010
@@ -7,7 +7,8 @@
     -DEOVERFLOW=75
     -Dlseek=_lseek
     -Dread=_read
-    -Dstrdup=_strdup)
+    -Dstrdup=_strdup
+    -D_DLL -D__USE_CRTIMP)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
 

Modified: branches/cmake-bringup/msc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=49509&r1=49508&r2=49509&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Nov  6 11:31:38 2010
@@ -121,6 +121,10 @@
     endforeach()
 endmacro()
 
+macro(pdef2def _pdef_file)
+# Dummy for now
+endmacro()
+
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 
 #pseh workaround

Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.txt?rev=49509&r1=49508&r2=49509&view=diff
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sat Nov  6 11:31:38 2010
@@ -9,11 +9,12 @@
 add_subdirectory(gendib)
 add_subdirectory(mkhive)
 add_subdirectory(nci)
+#add_subdirectory(spec2pdef)
 add_subdirectory(unicode)
 add_subdirectory(winebuild)
 if(NOT MSVC)
 #add_subdirectory(rsym)
-#add_subdirectory(wpp)
+add_subdirectory(wpp)
 #add_subdirectory(wmc)
 add_subdirectory(widl)
 #add_subdirectory(wrc)




More information about the Ros-diffs mailing list