Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- fix decorations on non-x86 builds
- improve batt and aclui
- remove set_export_spec macro

svn path=/branches/cmake-bringup/; revision=50207
This commit is contained in:
Timo Kreuzer 2010-12-29 08:08:18 +00:00
parent cf31695e04
commit 78cc22ef6f
3 changed files with 10 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dll/win32/aclui/CMakeLists.txt
View file

@ -1,4 +1,6 @@
spec2def(aclui.dll aclui.spec)
set_unicode() set_unicode()
add_definitions(-DSUPPORT_UXTHEME) add_definitions(-DSUPPORT_UXTHEME)
@ -18,9 +20,7 @@ add_library(aclui SHARED
set_module_type(aclui win32dll) set_module_type(aclui win32dll)
set_export_spec(aclui aclui.spec aclui.dll) add_importlib_target(aclui.spec)
add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def)
add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll)

6
dll/win32/batt/CMakeLists.txt
View file

@ -1,4 +1,6 @@
spec2def(batt.dll batt.spec)
set_unicode() set_unicode()
add_library(batt SHARED add_library(batt SHARED
@ -8,9 +10,7 @@ add_library(batt SHARED
set_module_type(batt win32dll) set_module_type(batt win32dll)
set_export_spec(batt batt.spec) add_importlib_target(batt.spec)
add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def)
add_importlibs(batt msvcrt kernel32) add_importlibs(batt msvcrt kernel32)

19
gcc.cmake
View file

@ -224,6 +224,10 @@ macro(add_importlibs MODULE)
endforeach() endforeach()
endmacro() endmacro()
if(NOT ARCH MATCHES i386)
set(DECO_OPTION "-@")
endif()
macro(add_importlib_target _exports_file) macro(add_importlib_target _exports_file)
get_filename_component(_name ${_exports_file} NAME_WE) get_filename_component(_name ${_exports_file} NAME_WE)
@ -236,10 +240,6 @@ macro(add_importlib_target _exports_file)
set(DLLNAME_OPTION "") set(DLLNAME_OPTION "")
endif() endif()
if(NOT ARCH MATCHES i386)
set(DECO_OPTION "-@")
endif()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a
COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} COMMAND native-spec2def ${DLLNAME_OPTION} ${DECO_OPTION} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}
@ -273,17 +273,6 @@ macro(spec2def _dllname _spec_file)
list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c)
endmacro() endmacro()
# Optional 3rd parameter: dllname
macro(set_export_spec _module _spec_file)
get_filename_component(_file ${_spec_file} NAME_WE)
if (${ARGC} GREATER 2)
set(_dllname ${ARGV2})
else()
set(_dllname ${_file}.dll)
endif()
spec2def(${_dllname} ${_spec_file})
endmacro()
#pseh lib, needed with mingw #pseh lib, needed with mingw
set(PSEH_LIB "pseh") set(PSEH_LIB "pseh")