From 1c18b9b72355e9ff6cd2b01e8d774d9a0d8ed419 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 6 Nov 2010 11:31:38 +0000
Subject: [PATCH] [CMAKE] - Add a preprocessed definition file for acledit. -
 Add the pdef2def macro. - Include wpp into build, widl links to it. - Fix
 libmpg123.

svn path=/branches/cmake-bringup/; revision=49509
---
 dll/win32/acledit/CMakeLists.txt      |  6 ++++--
 gcc.cmake                             | 10 ++++++++++
 lib/3rdparty/libmpg123/CMakeLists.txt |  3 ++-
 msc.cmake                             |  4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index 7efd2200a28..100df0346ce 100644
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -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})
diff --git a/gcc.cmake b/gcc.cmake
index 4811071e4b6..9b640089434 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -159,6 +159,16 @@ macro(add_importlib_target _def_file)
   # 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")
 
diff --git a/lib/3rdparty/libmpg123/CMakeLists.txt b/lib/3rdparty/libmpg123/CMakeLists.txt
index ba7bc4a05b9..88fb37b5322 100644
--- a/lib/3rdparty/libmpg123/CMakeLists.txt
+++ b/lib/3rdparty/libmpg123/CMakeLists.txt
@@ -7,7 +7,8 @@ add_definitions(
     -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)
 
diff --git a/msc.cmake b/msc.cmake
index c555033dea1..553c97018f8 100644
--- a/msc.cmake
+++ b/msc.cmake
@@ -121,6 +121,10 @@ macro(add_importlibs MODULE)
     endforeach()
 endmacro()
 
+macro(pdef2def _pdef_file)
+# Dummy for now
+endmacro()
+
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 
 #pseh workaround
-- 
2.17.1