[CMAKE]

- Fix and enable glu32 and winemp3.acm

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

diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt
index 079b0a7..68de1cc 100644 (file)
--- a/dll/win32/CMakeLists.txt
+++ b/dll/win32/CMakeLists.txt
@@ -40,7 +40,7 @@ add_subdirectory(fusion)
 add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(getuname)
-#add_subdirectory(glu32)# FIXME: set_cpp()?
+add_subdirectory(glu32)# FIXME: set_cpp()?
 add_subdirectory(hhctrl.ocx)
 add_subdirectory(hid)
 add_subdirectory(hlink)
@@ -199,7 +199,7 @@ add_subdirectory(vdmdbg)
 add_subdirectory(version)
 add_subdirectory(wdmaud.drv)
 add_subdirectory(windowscodecs)
-#add_subdirectory(winemp3.acm) #FIXME: ertr000001.o:(.rdata+0x0): undefined reference to `_pei386_runtime_relocator)'
+add_subdirectory(winemp3.acm)
 add_subdirectory(winfax)
 add_subdirectory(wing32)
 add_subdirectory(winhttp)

diff --git a/dll/win32/glu32/CMakeLists.txt b/dll/win32/glu32/CMakeLists.txt
index 7306418..d80c448 100644 (file)
--- a/dll/win32/glu32/CMakeLists.txt
+++ b/dll/win32/glu32/CMakeLists.txt
@@ -1,15 +1,17 @@
-set_cpp()
 
-add_definitions(-DRESOLVE_3D_TEXTURE_SUPPORT)
-add_definitions(-DBUILD_GL32)
-add_definitions(-DLIBRARYBUILD)
-add_definitions(-D_DLL -D__USE_CRTIMP)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/internals)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/interface)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libnurbs/nurbtess)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libtess)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libutil)
+add_definitions(
+    -DRESOLVE_3D_TEXTURE_SUPPORT
+    -DBUILD_GL32
+    -DLIBRARYBUILD
+    -D_DLL -D__USE_CRTIMP)
+
+include_directories(
+    include
+    libnurbs/internals
+    libnurbs/interface
+    libnurbs/nurbtess
+    libtess
+    libutil)
 
 spec2def(glu32.dll glu32.spec)
 
@@ -107,12 +109,14 @@ add_library(glu32 SHARED
 
 set_entrypoint(glu32 0)
 
-add_importlibs(
-    glu32
-    gcc
-    msvcrt
+target_link_libraries(glu32 stlport -lsupc++ -lgcc)
+
+add_importlibs(glu32
+    mingw32
+    coldname
     opengl32
     gdi32
+    msvcrt
     kernel32
     ntdll)
 

diff --git a/dll/win32/winemp3.acm/CMakeLists.txt b/dll/win32/winemp3.acm/CMakeLists.txt
index b1e811b..f2eada4 100644 (file)
--- a/dll/win32/winemp3.acm/CMakeLists.txt
+++ b/dll/win32/winemp3.acm/CMakeLists.txt
@@ -1,13 +1,17 @@
 
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-D__WINESRC__ -DWIN32)
+add_definitions(
+    -D_DLL -D__USE_CRTIMP
+    -D__WINESRC__
+    -DWIN32)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
 
 spec2def(winemp3.acm winemp3.acm.spec)
 
-add_library(winemp3.acm SHARED mpegl3.c
+add_library(winemp3.acm SHARED
+    mpegl3.c
     ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def)
 
 set_entrypoint(winemp3.acm 0)