Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-12 05:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
- Fix and enable glu32 and winemp3.acm

svn path=/branches/cmake-bringup/; revision=49500
This commit is contained in:
Amine Khaldi 2010-11-05 23:06:24 +00:00
parent e37863e0ac
commit f8a9857975
3 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/CMakeLists.txt
View file

@ -40,7 +40,7 @@ add_subdirectory(fusion)
add_subdirectory(gdi32) add_subdirectory(gdi32)
add_subdirectory(gdiplus) add_subdirectory(gdiplus)
add_subdirectory(getuname) add_subdirectory(getuname)
#add_subdirectory(glu32)# FIXME: set_cpp()? add_subdirectory(glu32)# FIXME: set_cpp()?
add_subdirectory(hhctrl.ocx) add_subdirectory(hhctrl.ocx)
add_subdirectory(hid) add_subdirectory(hid)
add_subdirectory(hlink) add_subdirectory(hlink)
@ -199,7 +199,7 @@ add_subdirectory(vdmdbg)
add_subdirectory(version) add_subdirectory(version)
add_subdirectory(wdmaud.drv) add_subdirectory(wdmaud.drv)
add_subdirectory(windowscodecs) 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(winfax)
add_subdirectory(wing32) add_subdirectory(wing32)
add_subdirectory(winhttp) add_subdirectory(winhttp)

34
dll/win32/glu32/CMakeLists.txt
View file

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

14
dll/win32/winemp3.acm/CMakeLists.txt
View file

@ -1,13 +1,17 @@
add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(
add_definitions(-D__WINESRC__ -DWIN32) -D_DLL -D__USE_CRTIMP
-D__WINESRC__
-DWIN32)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123) ${REACTOS_SOURCE_DIR}/include/reactos/wine
${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)
spec2def(winemp3.acm winemp3.acm.spec) 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) ${CMAKE_CURRENT_BINARY_DIR}/winemp3.def)
set_entrypoint(winemp3.acm 0) set_entrypoint(winemp3.acm 0)