Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
* Addendum to r64795.
* Also remove unneeded wine linking and ntdll importing.
* Remove redundant defines.

svn path=/trunk/; revision=64796
This commit is contained in:
Amine Khaldi 2014-10-17 23:29:24 +00:00
parent 2bdcf8789d
commit c0e495f046
54 changed files with 67 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rostests/tests/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_subdirectory(mmixer_test)
if (NOT MSVC)
if(NOT MSVC)
add_subdirectory(pseh2)
endif()
add_subdirectory(dllexport)

12
rostests/tests/dllexport/CMakeLists.txt
View file

@ -3,21 +3,23 @@ spec2def(dllexport_test_dll1.dll dllexport_test_dll1.spec ADD_IMPORTLIB)
spec2def(dllexport_test_dll2.dll dllexport_test_dll2.spec ADD_IMPORTLIB)
set(baseaddress_dllexport_test_dll1 0x1000000)
add_library(dllexport_test_dll1 SHARED
dllexport_test_dll1.c
${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def)
set_module_type(dllexport_test_dll1 module)
add_importlibs(dllexport_test_dll1 dllexport_test_dll2)
set(baseaddress_dllexport_test_dll2 0x2000000)
add_library(dllexport_test_dll2 SHARED
dllexport_test_dll2.c
${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def)
set_module_type(dllexport_test_dll2 module)
add_executable(dllexport_test
dllexport_test.c)
add_executable(dllexport_test dllexport_test.c)
set_module_type(dllexport_test win32cui)
add_importlibs(dllexport_test dllexport_test_dll1 msvcrt kernel32 ntdll)
@ -25,10 +27,10 @@ if(MSVC)
add_compile_flags("/Zc:wchar_t-")
endif()
add_library(dllimport_test SHARED
dllimport_framedyn.cpp)
add_library(dllimport_test SHARED dllimport_framedyn.cpp)
set_module_type(dllimport_test module)
add_importlibs(dllimport_test framedyn)
if(NOT MSVC)
target_link_libraries(dllimport_test framedynex)
endif()

3
rostests/tests/mmixer_test/CMakeLists.txt
View file

@ -1,11 +1,8 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer)
add_executable(mmixer_test test.c)
set_module_type(mmixer_test win32cui)
target_link_libraries(mmixer_test mmixer)
add_importlibs(mmixer_test advapi32 setupapi winmm ksuser user32 msvcrt kernel32)