- get rid of set_unicode macro.
- Add an option to set_module_type to do the work instead
- Improve debug output

svn path=/trunk/; revision=53559
This commit is contained in:
Jérôme Gardou 2011-09-03 19:11:44 +00:00
parent 427928c2a5
commit 3f94b0599a
140 changed files with 154 additions and 291 deletions

View file

@ -1,11 +1,10 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE cacls.c cacls.rc)
add_executable(cacls ${SOURCE})
set_module_type(cacls win32cui)
set_module_type(cacls win32cui UNICODE)
add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
@ -13,7 +12,7 @@ add_executable(calc
winmain.c
resource.rc)
set_module_type(calc win32gui)
set_module_type(calc win32gui UNICODE)
add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32)
if(MSVC)
add_importlibs(calc ntdll)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -11,7 +10,7 @@ list(APPEND SOURCE
add_executable(charmap ${SOURCE})
set_module_type(charmap win32gui)
set_module_type(charmap win32gui UNICODE)
add_importlibs(charmap msvcrt user32 gdi32 comctl32 kernel32)

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(doskey doskey.c doskey.rc)
set_module_type(doskey win32cui)
set_module_type(doskey win32cui UNICODE)
add_importlibs(doskey user32 msvcrt kernel32)
add_cd_file(TARGET doskey DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,7 @@
set_unicode()
add_executable(lodctr lodctr_main.c)
set_module_type(lodctr win32cui)
set_module_type(lodctr win32cui UNICODE)
add_importlibs(lodctr loadperf msvcrt kernel32)
add_cd_file(TARGET lodctr DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
remove_definitions(-D_WIN32_WINNT=0x502)
@ -7,6 +6,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_executable(reg reg.c rsrc.rc)
set_module_type(reg win32cui)
set_module_type(reg win32cui UNICODE)
add_importlibs(reg advapi32 user32 msvcrt kernel32)
add_cd_file(TARGET reg DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,9 @@
set_unicode()
set_rc_compiler()
add_executable(xcopy xcopy.c rsrc.rc)
target_link_libraries(xcopy wine)
set_module_type(xcopy win32cui)
set_module_type(xcopy win32cui UNICODE)
add_importlibs(xcopy shell32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET xcopy DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(control control.c control.rc)
set_module_type(control win32gui)
set_module_type(control win32gui UNICODE)
add_importlibs(control advapi32 shell32 msvcrt kernel32)
add_cd_file(TARGET control DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -20,7 +19,7 @@ list(APPEND SOURCE
add_executable(dxdiag ${SOURCE})
set_module_type(dxdiag win32gui)
set_module_type(dxdiag win32gui UNICODE)
target_link_libraries(dxdiag dxguid)

View file

@ -1,10 +1,9 @@
set_unicode()
add_executable(extrac32 extrac32.c)
target_link_libraries(extrac32 wine)
set_module_type(extrac32 win32gui)
set_module_type(extrac32 win32gui UNICODE)
add_importlibs(extrac32 shell32 setupapi shlwapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET extrac32 DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_cpp()
set_rc_compiler()
@ -13,6 +12,6 @@ add_executable(sol
target_link_libraries(sol cardlib)
add_pch(sol solitaire.h)
set_module_type(sol win32gui)
set_module_type(sol win32gui UNICODE)
add_importlibs(sol advapi32 comctl32 user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET sol DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_cpp()
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib ${CMAKE_CURRENT_SOURCE_DIR})
@ -13,6 +12,6 @@ add_executable(spider
target_link_libraries(spider cardlib)
add_pch(spider spider.h)
set_module_type(spider win32gui)
set_module_type(spider win32gui UNICODE)
add_importlibs(spider advapi32 comctl32 user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET spider DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,9 @@
set_unicode()
set_rc_compiler()
add_executable(kbswitch kbswitch.c kbswitch.rc)
set_module_type(kbswitch win32gui)
set_module_type(kbswitch win32gui UNICODE)
add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)
add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
spec2def(kbsdll.dll kbsdll.spec)
@ -10,6 +9,6 @@ list(APPEND SOURCE
add_library(kbsdll SHARED ${SOURCE})
set_module_type(kbsdll win32dll)
set_module_type(kbsdll win32dll UNICODE)
add_importlibs(kbsdll user32 comctl32 msvcrt kernel32)
add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
set_rc_compiler()
set_unicode()
list(APPEND SOURCE
console.c
@ -10,6 +9,6 @@ list(APPEND SOURCE
add_executable(mmcclient ${SOURCE})
set_module_type(mmcclient win32gui)
set_module_type(mmcclient win32gui UNICODE)
add_importlibs(mmcclient user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32)
add_pch(mmcclient precomp.h)

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(mplay32 mplay32.c mplay32.rc)
set_module_type(mplay32 win32gui)
set_module_type(mplay32 win32gui UNICODE)
add_importlibs(mplay32 advapi32 comctl32 comdlg32 user32 gdi32 winmm shell32 msvcrt kernel32)
add_cd_file(TARGET mplay32 DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -14,7 +13,7 @@ list(APPEND SOURCE
add_executable(msconfig ${SOURCE})
set_module_type(msconfig win32gui)
set_module_type(msconfig win32gui UNICODE)
add_importlibs(msconfig user32 advapi32 version comctl32 shell32 shlwapi msvcrt kernel32)
add_pch(msconfig precomp.h)
add_cd_file(TARGET msconfig DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -12,7 +11,7 @@ list(APPEND SOURCE
add_executable(devmgmt ${SOURCE})
set_module_type(devmgmt win32gui)
set_module_type(devmgmt win32gui UNICODE)
add_importlibs(devmgmt setupapi gdi32 user32 comctl32 advapi32 devmgr msvcrt kernel32)
add_pch(devmgmt precomp.h)
add_cd_file(TARGET devmgmt DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,9 @@
set_unicode()
set_rc_compiler()
add_executable(eventvwr eventvwr.c eventvwr.rc)
set_module_type(eventvwr win32gui)
set_module_type(eventvwr win32gui UNICODE)
add_importlibs(eventvwr user32 comctl32 advapi32 msvcrt kernel32)
if(MSVC)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -26,7 +25,7 @@ list(APPEND SOURCE
add_executable(servman ${SOURCE})
set_module_type(servman win32gui)
set_module_type(servman win32gui UNICODE)
add_importlibs(servman user32 gdi32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
add_executable(mspaint
@ -17,7 +16,7 @@ add_executable(mspaint
winproc.c
rsrc.rc)
set_module_type(mspaint win32gui)
set_module_type(mspaint win32gui UNICODE)
add_pch(mspaint precomp.h)
add_importlibs(mspaint comdlg32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32)
add_cd_file(TARGET mspaint DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -26,7 +25,7 @@ list(APPEND SOURCE
add_executable(mstsc ${SOURCE})
set_module_type(mstsc win32gui)
set_module_type(mstsc win32gui UNICODE)
add_importlibs(mstsc user32 gdi32 comctl32 ws2_32 advapi32 shell32 ole32 comdlg32 msvcrt kernel32)

View file

@ -1,9 +1,8 @@
set_unicode()
add_executable(dwnl dwnl.c)
set_module_type(dwnl win32cui)
set_module_type(dwnl win32cui UNICODE)
target_link_libraries(dwnl uuid)

View file

@ -1,12 +1,11 @@
add_definitions(-D__USE_W32_SOCKETS)
set_unicode()
set_rc_compiler()
add_executable(ping ping.c ping.rc)
set_module_type(ping win32cui)
set_module_type(ping win32cui UNICODE)
add_importlibs(ping ws2_32 msvcrt kernel32)
if(MSVC)

View file

@ -1,8 +1,7 @@
set_unicode()
add_executable(route route.c route.rc)
set_module_type(route win32cui)
set_module_type(route win32cui UNICODE)
add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
add_cd_file(TARGET route DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
list(APPEND SOURCE
aboutdlg.c
@ -27,7 +26,7 @@ set_rc_compiler()
add_executable(rapps ${SOURCE})
add_pch(rapps rapps.h)
set_module_type(rapps win32gui)
set_module_type(rapps win32gui UNICODE)
target_link_libraries(rapps uuid)
add_importlibs(rapps advapi32 comctl32 gdi32 urlmon user32 shell32 shlwapi msvcrt kernel32 ntdll)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
include_directories(BEFORE .)
@ -22,7 +21,7 @@ list(APPEND SOURCE
add_executable(regedit ${SOURCE})
set_module_type(regedit win32gui)
set_module_type(regedit win32gui UNICODE)
target_link_libraries(regedit uuid)

View file

@ -1,7 +1,6 @@
spec2def(clb.dll clb.spec)
set_unicode()
set_rc_compiler()
add_library(clb SHARED
@ -9,6 +8,6 @@ add_library(clb SHARED
clb.rc
${CMAKE_CURRENT_BINARY_DIR}/clb.def)
set_module_type(clb win32dll)
set_module_type(clb win32dll UNICODE)
add_importlibs(clb user32 gdi32 comctl32 kernel32 ntdll)

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(regedt32 regedt32.c resource.rc)
set_module_type(regedt32 win32gui)
set_module_type(regedt32 win32gui UNICODE)
add_importlibs(regedt32 shell32 shlwapi msvcrt kernel32)
add_cd_file(TARGET regedt32 DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(-DDEFINE_GUID)
list(APPEND SOURCE
@ -15,7 +14,7 @@ list(APPEND SOURCE
add_executable(sc ${SOURCE})
set_module_type(sc win32cui)
set_module_type(sc win32cui UNICODE)
add_importlibs(sc advapi32 msvcrt kernel32)
add_pch(sc sc.h)
add_cd_file(TARGET sc DESTINATION reactos/system32 FOR all)

View file

@ -1,13 +1,12 @@
set_rc_compiler()
set_unicode()
add_executable(3dtext
3dtext.c
settings.c
rsrc.rc)
set_module_type(3dtext win32gui)
set_module_type(3dtext win32gui UNICODE)
add_pch(3dtext 3dtext.h)
set_target_properties(3dtext PROPERTIES SUFFIX ".scr")
target_link_libraries(3dtext scrnsave)

View file

@ -1,10 +1,9 @@
set_rc_compiler()
set_unicode()
add_executable(logon logon.c logon.rc)
set_module_type(logon win32gui)
set_module_type(logon win32gui UNICODE)
set_target_properties(logon PROPERTIES SUFFIX ".scr")
target_link_libraries(logon scrnsave)

View file

@ -1,5 +1,4 @@
set_unicode()
set_cpp()
set_rc_compiler()
@ -15,6 +14,6 @@ add_executable(sndrec32
rsrc.rc)
target_link_libraries(sndrec32 stlport)
set_module_type(sndrec32 win32gui)
set_module_type(sndrec32 win32gui UNICODE)
add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32)
add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -11,7 +10,7 @@ list(APPEND SOURCE
add_executable(sndvol32 ${SOURCE})
set_module_type(sndvol32 win32gui)
set_module_type(sndvol32 win32gui UNICODE)
add_importlibs(sndvol32 user32 advapi32 gdi32 comctl32 shell32 winmm msvcrt kernel32 ntdll)
add_pch(sndvol32 sndvol32.h)
add_cd_file(TARGET sndvol32 DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
list(APPEND SOURCE
@ -25,7 +24,7 @@ list(APPEND SOURCE
add_executable(taskmgr ${SOURCE})
set_module_type(taskmgr win32gui)
set_module_type(taskmgr win32gui UNICODE)
add_importlibs(taskmgr advapi32 user32 gdi32 shell32 comctl32 msvcrt kernel32 ntdll)
add_pch(taskmgr precomp.h)
add_cd_file(TARGET taskmgr DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,6 @@
set_unicode()
add_executable(winver winver.c)
set_module_type(winver win32gui)
set_module_type(winver win32gui UNICODE)
add_importlibs(winver shell32 msvcrt kernel32)
add_cd_file(TARGET winver DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,7 @@
set_unicode()
set_rc_compiler()
add_executable(write write.c rsrc.rc)
set_module_type(write win32gui)
set_module_type(write win32gui UNICODE)
add_importlibs(write user32 gdi32 msvcrt kernel32)
add_cd_file(TARGET write DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,4 @@
set_unicode(audiosrv yes)
add_executable(audiosrv
main.c
pnp_list_manager.c
@ -10,7 +8,7 @@ add_executable(audiosrv
debug.c
audiosrv.rc)
set_module_type(audiosrv win32cui)
set_module_type(audiosrv win32cui UNICODE)
add_pch(audiosrv audiosrv.h)
add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32)
add_cd_file(TARGET audiosrv DESTINATION reactos/system32 FOR all)

View file

@ -4,7 +4,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/eventlogrpc.idl)
set_unicode()
list(APPEND SOURCE
eventlog.c
@ -21,7 +20,7 @@ if(NOT MSVC)
target_link_libraries(eventlog pseh)
endif()
set_module_type(eventlog win32cui)
set_module_type(eventlog win32cui UNICODE)
add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll)
add_pch(eventlog eventlog.h)
add_cd_file(TARGET eventlog DESTINATION reactos/system32 FOR all)

View file

@ -3,7 +3,6 @@ add_rpc_files(server
${REACTOS_SOURCE_DIR}/include/reactos/wine/epm.idl
${REACTOS_SOURCE_DIR}/include/reactos/wine/irot.idl)
set_unicode()
list(APPEND SOURCE
epmp.c
@ -22,7 +21,7 @@ target_link_libraries(rpcss
${PSEH_LIB}
wine)
set_module_type(rpcss win32cui)
set_module_type(rpcss win32cui UNICODE)
add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,9 @@
set_unicode()
add_executable(spoolsv spoolsv.c spoolsv.rc)
target_link_libraries(spoolsv wine)
set_module_type(spoolsv win32cui)
set_module_type(spoolsv win32cui UNICODE)
add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
list(APPEND SOURCE
tcpsvcs.c
@ -14,7 +13,7 @@ list(APPEND SOURCE
add_executable(tcpsvcs ${SOURCE})
set_module_type(tcpsvcs win32cui)
set_module_type(tcpsvcs win32cui UNICODE)
add_importlibs(tcpsvcs ws2_32 advapi32 msvcrt kernel32 ntdll)
add_pch(tcpsvcs tcpsvcs.h)

View file

@ -6,7 +6,6 @@ add_definitions(-D_WIN32_WINNT=0x600)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)
set_unicode()
add_executable(umpnpmgr
umpnpmgr.c
@ -17,6 +16,6 @@ target_link_libraries(umpnpmgr
wdmguid
${PSEH_LIB})
set_module_type(umpnpmgr win32cui)
set_module_type(umpnpmgr win32cui UNICODE)
add_importlibs(umpnpmgr advapi32 rpcrt4 userenv msvcrt kernel32 ntdll)
add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all)

View file

@ -3,7 +3,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl)
set_unicode()
add_executable(wlansvc
wlansvc.c
@ -14,6 +13,6 @@ if(NOT MSVC)
target_link_libraries(wlansvc pseh)
endif()
set_module_type(wlansvc win32cui)
set_module_type(wlansvc win32cui UNICODE)
add_importlibs(wlansvc advapi32 rpcrt4 iphlpapi msvcrt kernel32 ntdll)
add_cd_file(TARGET wlansvc DESTINATION reactos/system32 FOR all)

View file

@ -1,11 +1,10 @@
set_unicode()
set_rc_compiler()
add_executable(reactos reactos.c reactos.rc)
target_link_libraries(reactos uuid)
set_module_type(reactos win32gui)
set_module_type(reactos win32gui UNICODE)
add_importlibs(reactos gdi32 user32 comctl32 setupapi msvcrt kernel32 ntdll)
add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)

View file

@ -1,8 +1,7 @@
set_unicode()
add_executable(setup setup.c setup.rc)
set_module_type(setup win32gui)
set_module_type(setup win32gui UNICODE)
add_importlibs(setup userenv msvcrt kernel32 ntdll)
add_cd_file(TARGET setup DESTINATION reactos/system32 FOR all)

View file

@ -1,12 +1,11 @@
set_unicode()
set_rc_compiler()
add_executable(vmwinst vmwinst.c vmwinst.rc)
target_link_libraries(vmwinst ${PSEH_LIB})
set_module_type(vmwinst win32gui)
set_module_type(vmwinst win32gui UNICODE)
add_importlibs(vmwinst
advapi32
comctl32

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(welcome welcome.c welcome.rc)
set_module_type(welcome win32gui)
set_module_type(welcome win32gui UNICODE)
add_importlibs(welcome gdi32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd)

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(
-DANONYMOUSUNIONS
@ -76,7 +75,7 @@ add_executable(cmd ${SOURCE})
target_link_libraries(cmd wine)
set_module_type(cmd win32cui)
set_module_type(cmd win32cui UNICODE)
add_importlibs(cmd advapi32 user32 msvcrt kernel32 ntdll)
add_pch(cmd precomp.h)
add_cd_file(TARGET cmd DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(-DWIN32)
@ -22,7 +21,7 @@ add_executable(explorer_new ${SOURCE})
target_link_libraries(explorer_new uuid)
set_module_type(explorer_new win32gui)
set_module_type(explorer_new win32gui UNICODE)
add_importlibs(explorer_new
advapi32
gdi32

View file

@ -1,7 +1,6 @@
add_subdirectory(notifyhook)
set_unicode()
set_rc_compiler()
#NOTE : explorer doesn't follow standard c++, and so doesn't compile with stlport headers
@ -11,7 +10,8 @@ set_rc_compiler()
add_definitions(
-DWIN32
-D__WINDRES__)
-D__WINDRES__
-DUNICODE -D_UNICODE)
#add_pch(explorer precomp.h)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@ -56,7 +56,7 @@ list(APPEND SOURCE
add_executable(explorer ${SOURCE})
set_subsystem(explorer windows)
set_entrypoint(explorer WinMainCRTStartup)
set_entrypoint(explorer wWinMainCRTStartup)
target_link_libraries(explorer
-lsupc++

View file

@ -1,8 +1,7 @@
set_unicode()
add_executable(bootok bootok.c bootok.rc)
set_module_type(bootok win32cui)
set_module_type(bootok win32cui UNICODE)
add_importlibs(bootok advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET bootok DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,9 @@
set_unicode()
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
add_executable(lsass lsass.c lsass.rc)
set_module_type(lsass win32gui)
set_module_type(lsass win32gui UNICODE)
add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll)
add_cd_file(TARGET lsass DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(regsvr32 regsvr32.c regsvr32.rc)
set_module_type(regsvr32 win32gui)
set_module_type(regsvr32 win32gui UNICODE)
add_importlibs(regsvr32 user32 shell32 ole32 msvcrt kernel32 ntdll)
add_cd_file(TARGET regsvr32 DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,9 @@
set_unicode()
include_directories(.)
set_rc_compiler()
add_executable(rundll32 rundll32.c rundll32.rc)
set_module_type(rundll32 win32gui)
set_module_type(rundll32 win32gui UNICODE)
add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET rundll32 DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,8 @@
set_unicode()
set_rc_compiler()
add_executable(runonce runonce.c runonce.rc)
set_module_type(runonce win32gui)
set_module_type(runonce win32gui UNICODE)
add_importlibs(runonce advapi32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET runonce DESTINATION reactos/system32 FOR all)

View file

@ -6,7 +6,6 @@ include_directories(
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl)
set_unicode()
list(APPEND SOURCE
config.c
@ -24,7 +23,7 @@ if(NOT MSVC)
target_link_libraries(services pseh)
endif()
set_module_type(services win32cui)
set_module_type(services win32cui UNICODE)
add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
add_pch(services services.h ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.h)
add_cd_file(TARGET services DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
include_directories(.)
set_rc_compiler()
@ -7,6 +6,6 @@ add_executable(userinit userinit.c userinit.rc)
target_link_libraries(userinit wine)
set_module_type(userinit win32gui)
set_module_type(userinit win32gui UNICODE)
add_importlibs(userinit user32 gdi32 advapi32 shell32 shlwapi msvcrt kernel32 ntdll)
add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all)

View file

@ -241,8 +241,12 @@ function(add_importlibs _module)
endfunction()
function(set_module_type MODULE TYPE)
cmake_parse_arguments(__module "" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN})
if(__module_UNPARSED_ARGUMENTS)
message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}")
endif()
# Set subsystem. Also take this as an occasion
# to error out if someone gave a non existing type
if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver))
@ -259,15 +263,15 @@ function(set_module_type MODULE TYPE)
set_subsystem(${MODULE} ${__subsystem})
endif()
if(__module_UNPARSED_ARGUMENTS)
message(STATUS ${__module_UNPARSED_ARGUMENTS})
#set unicode definitions
if(__module_UNICODE)
add_target_compile_definitions(${MODULE} -DUNICODE -D_UNICODE)
endif()
# set entry point
if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0"))
list(GET __module_ENTRYPOINT 0 __entrypoint)
list(LENGTH __module_ENTRYPOINT __length)
message(STATUS "Entrypoint ${__entrypoint}, module ${MODULE}")
if(${__length} EQUAL 2)
list(GET __module_ENTRYPOINT 1 __entrystack)
elseif(NOT ${__length} EQUAL 1)
@ -278,11 +282,11 @@ function(set_module_type MODULE TYPE)
set(__entrypoint NtProcessStartup)
set(__entrystack 4)
elseif((${TYPE} STREQUAL win32gui) OR (${TYPE} STREQUAL win32cui))
if(IS_UNICODE)
if(__module_UNICODE)
set(__entrypoint wWinMainCRTStartup)
else()
set(__entrypoint WinMainCRTStartup)
endif(IS_UNICODE)
endif()
elseif((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
OR (${TYPE} STREQUAL cpl))
set(__entrypoint DllMainCRTStartup)

View file

@ -66,8 +66,3 @@ endfunction()
function(add_target_include_directories _module)
add_target_property(${_module} INCLUDE_DIRECTORIES ${ARGN})
endfunction()
macro(set_unicode)
add_definitions(-DUNICODE -D_UNICODE)
set(IS_UNICODE 1)
endmacro()

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(access.cpl access.spec)
@ -14,7 +13,7 @@ add_library(access SHARED
access.rc
${CMAKE_CURRENT_BINARY_DIR}/access.def)
set_module_type(access cpl)
set_module_type(access cpl UNICODE)
add_importlibs(access
msvcrt

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(appwiz.cpl appwiz.spec)
@ -10,7 +9,7 @@ add_library(appwiz SHARED
appwiz.rc
${CMAKE_CURRENT_BINARY_DIR}/appwiz.def)
set_module_type(appwiz cpl)
set_module_type(appwiz cpl UNICODE)
target_link_libraries(appwiz uuid)

View file

@ -1,5 +1,4 @@
set_unicode()
spec2def(console.dll console.spec)
@ -14,7 +13,7 @@ list(APPEND SOURCE
add_library(console SHARED ${SOURCE})
set_module_type(console win32dll)
set_module_type(console win32dll UNICODE)
add_importlibs(console
msvcrt

View file

@ -1,7 +1,6 @@
add_definitions(-D_WIN32)
set_unicode()
set_rc_compiler()
spec2def(desk.cpl desk.spec)
@ -27,7 +26,7 @@ add_library(desk SHARED
theme.c
${CMAKE_CURRENT_BINARY_DIR}/desk.def)
set_module_type(desk cpl)
set_module_type(desk cpl UNICODE)
target_link_libraries(desk uuid)

View file

@ -1,12 +1,11 @@
set_unicode()
set_rc_compiler()
spec2def(hdwwiz.cpl hdwwiz.spec)
add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
set_module_type(hdwwiz cpl)
set_module_type(hdwwiz cpl UNICODE)
add_importlibs(hdwwiz
msvcrt

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
@ -17,7 +16,7 @@ list(APPEND SOURCE
add_library(inetcpl SHARED ${SOURCE})
set_module_type(inetcpl cpl)
set_module_type(inetcpl cpl UNICODE)
target_link_libraries(inetcpl wine)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(input.dll input.spec)
@ -13,7 +12,7 @@ add_library(input SHARED
input.rc
${CMAKE_CURRENT_BINARY_DIR}/input.def)
set_module_type(input win32dll)
set_module_type(input win32dll UNICODE)
add_importlibs(input
msvcrt

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(intl.cpl intl.spec)
@ -19,7 +18,7 @@ add_library(intl SHARED
sort.c
intl.rc)
set_module_type(intl cpl)
set_module_type(intl cpl UNICODE)
add_importlibs(intl
msvcrt

View file

@ -1,12 +1,11 @@
set_unicode()
set_rc_compiler()
spec2def(joy.cpl joy.spec)
add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
set_module_type(joy cpl)
set_module_type(joy cpl UNICODE)
target_link_libraries(joy uuid)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(main.cpl main.spec)
@ -11,7 +10,7 @@ add_library(main SHARED
main.rc
${CMAKE_CURRENT_BINARY_DIR}/main.def)
set_module_type(main cpl)
set_module_type(main cpl UNICODE)
add_importlibs(main
msvcrt

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(mmsys.cpl mmsys.spec)
@ -13,7 +12,7 @@ add_library(mmsys SHARED
mmsys.rc
${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
set_module_type(mmsys cpl)
set_module_type(mmsys cpl UNICODE)
add_importlibs(mmsys
msvcrt

View file

@ -1,11 +1,10 @@
set_unicode()
spec2def(ncpa.cpl ncpa.spec)
add_library(ncpa SHARED ncpa.c ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
set_module_type(ncpa cpl)
set_module_type(ncpa cpl UNICODE)
add_importlibs(ncpa
msvcrt

View file

@ -1,11 +1,10 @@
set_unicode()
spec2def(odbccp32i.cpl odbccp32.spec)
add_library(odbccp32i SHARED odbccp32.c odbccp32.rc ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def)
set_module_type(odbccp32i cpl)
set_module_type(odbccp32i cpl UNICODE)
add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32)
add_cd_file(TARGET odbccp32i DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(powercfg.cpl powercfg.spec)
@ -13,7 +12,7 @@ add_library(powercfg SHARED
powercfg.rc
${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
set_module_type(powercfg cpl)
set_module_type(powercfg cpl UNICODE)
add_importlibs(powercfg
msvcrt

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(sysdm.cpl sysdm.spec)
@ -20,7 +19,7 @@ list(APPEND SOURCE
add_library(sysdm SHARED ${SOURCE})
set_module_type(sysdm cpl)
set_module_type(sysdm cpl UNICODE)
add_importlibs(sysdm
msvcrt

View file

@ -1,12 +1,11 @@
set_unicode()
set_rc_compiler()
spec2def(telephon.cpl telephon.spec)
add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
set_module_type(telephon cpl)
set_module_type(telephon cpl UNICODE)
target_link_libraries(telephon uuid)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(timedate.cpl timedate.spec)
@ -15,7 +14,7 @@ add_library(timedate SHARED
timedate.rc
${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
set_module_type(timedate cpl)
set_module_type(timedate cpl UNICODE)
add_importlibs(timedate
advapi32

View file

@ -1,5 +1,4 @@
set_unicode()
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
@ -18,7 +17,7 @@ add_library(usrmgr SHARED
usrmgr.rc
${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
set_module_type(usrmgr cpl)
set_module_type(usrmgr cpl UNICODE)
add_importlibs(usrmgr
advapi32

View file

@ -1,5 +1,4 @@
set_unicode()
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@ -17,7 +16,7 @@ add_library(devenum SHARED
devenum.rc
${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
set_module_type(devenum win32dll)
set_module_type(devenum win32dll UNICODE)
target_link_libraries(devenum
strmiids

View file

@ -1,5 +1,4 @@
set_unicode()
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@ -21,7 +20,7 @@ add_library(dinput SHARED
version.rc
${CMAKE_CURRENT_BINARY_DIR}/dinput.def)
set_module_type(dinput win32dll)
set_module_type(dinput win32dll UNICODE)
target_link_libraries(dinput
dxguid

View file

@ -1,5 +1,4 @@
set_unicode()
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@ -14,7 +13,7 @@ add_library(dinput8 SHARED
version.rc
${CMAKE_CURRENT_BINARY_DIR}/dinput8.def)
set_entrypoint(dinput8 0)
set_module_type(dinput8 win32dll UNICODE ENTRYPOINT 0)
target_link_libraries(dinput8
dxguid

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(-D__WINESRC__)
@ -24,7 +23,7 @@ add_library(dmusic SHARED
version.rc
${CMAKE_CURRENT_BINARY_DIR}/dmusic.def)
set_entrypoint(dmusic 0)
set_module_type(dmusic win32dll UNICODE ENTRYPOINT 0)
target_link_libraries(dmusic
dxguid

View file

@ -1,5 +1,4 @@
set_unicode()
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@ -10,7 +9,7 @@ add_library(dplay SHARED
version.rc
${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
set_entrypoint(dplay 0)
set_module_type(dplay win32dll UNICODE ENTRYPOINT 0)
target_link_libraries(dplay
uuid

View file

@ -1,5 +1,4 @@
set_unicode()
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@ -12,7 +11,7 @@ add_library(dxdiagn SHARED
regsvr.c
${CMAKE_CURRENT_BINARY_DIR}/dxdiagn.def)
set_module_type(dxdiagn win32dll)
set_module_type(dxdiagn win32dll UNICODE)
target_link_libraries(dxdiagn uuid wine)

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
@ -13,7 +12,7 @@ add_library(msdmo SHARED
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/msdmo.def)
set_entrypoint(msdmo 0)
set_module_type(msdmo win32dll ENTRYPOINT 0 UNICODE)
target_link_libraries(msdmo uuid wine mediaobj_guid)

View file

@ -1,6 +1,4 @@
set_unicode()
add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502)
@ -17,7 +15,7 @@ add_library(qedit SHARED
samplegrabber.c
${CMAKE_CURRENT_BINARY_DIR}/qedit.def)
set_module_type(qedit win32dll)
set_module_type(qedit win32dll UNICODE)
target_link_libraries(qedit
strmiids

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(
-D__WINESRC__
@ -29,7 +28,7 @@ list(APPEND SOURCE
add_library(d3d8 SHARED ${SOURCE})
set_module_type(d3d8 win32dll)
set_module_type(d3d8 win32dll UNICODE)
target_link_libraries(d3d8 uuid wine)

View file

@ -1,5 +1,4 @@
set_unicode()
add_definitions(
-D__WINESRC__
@ -32,7 +31,7 @@ list(APPEND SOURCE
add_library(d3d9 SHARED ${SOURCE})
set_module_type(d3d9 win32dll)
set_module_type(d3d9 win32dll UNICODE)
target_link_libraries(d3d9 uuid wine)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(deskadp.dll deskadp.spec)
@ -11,7 +10,7 @@ list(APPEND SOURCE
add_library(deskadp SHARED ${SOURCE})
set_module_type(deskadp win32dll)
set_module_type(deskadp win32dll UNICODE)
target_link_libraries(deskadp uuid)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(deskmon.dll deskmon.spec)
@ -12,7 +11,7 @@ list(APPEND SOURCE
add_library(deskmon SHARED ${SOURCE})
set_module_type(deskmon win32dll)
set_module_type(deskmon win32dll UNICODE)
target_link_libraries(deskmon uuid)

View file

@ -1,12 +1,11 @@
set_unicode()
set_rc_compiler()
spec2def(devcpux.dll devcpux.spec)
add_library(devcpux SHARED processor.c processor.rc ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def)
set_module_type(devcpux win32dll)
set_module_type(devcpux win32dll UNICODE)
add_importlibs(devcpux
user32

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(fontext.dll fontext.spec)
@ -9,7 +8,7 @@ add_library(fontext SHARED
fontext.rc
${CMAKE_CURRENT_BINARY_DIR}/fontext.def)
set_module_type(fontext win32dll)
set_module_type(fontext win32dll UNICODE)
target_link_libraries(fontext uuid)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(slayer.dll slayer.spec)
@ -11,7 +10,7 @@ list(APPEND SOURCE
add_library(slayer SHARED ${SOURCE})
set_module_type(slayer win32dll)
set_module_type(slayer win32dll UNICODE)
target_link_libraries(slayer uuid)

View file

@ -1,5 +1,4 @@
set_unicode()
set_rc_compiler()
spec2def(acledit.dll acledit.spec)
@ -11,7 +10,7 @@ list(APPEND SOURCE
add_library(acledit SHARED ${SOURCE})
set_module_type(acledit win32dll)
set_module_type(acledit win32dll UNICODE)
add_importlibs(acledit msvcrt kernel32 ntdll)
add_pch(acledit acleditint.h)
add_cd_file(TARGET acledit DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,6 @@
spec2def(aclui.dll aclui.spec)
set_rc_compiler()
set_unicode()
add_definitions(-DSUPPORT_UXTHEME)
@ -16,7 +15,7 @@ list(APPEND SOURCE
add_library(aclui SHARED ${SOURCE})
set_module_type(aclui win32dll)
set_module_type(aclui win32dll UNICODE)
add_importlib_target(aclui.spec)

View file

@ -15,7 +15,6 @@ add_rpc_files(client
${REACTOS_SOURCE_DIR}/include/reactos/idl/lsa.idl
${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl)
set_unicode()
list(APPEND SOURCE
crypt/crypt.c
@ -57,7 +56,7 @@ list(APPEND SOURCE
add_library(advapi32 SHARED ${SOURCE})
set_module_type(advapi32 win32dll)
set_module_type(advapi32 win32dll UNICODE)
target_link_libraries(advapi32
wine

View file

@ -1,5 +1,4 @@
set_unicode()
spec2def(authz.dll authz.spec)
@ -13,7 +12,7 @@ list(APPEND SOURCE
add_library(authz SHARED ${SOURCE})
set_module_type(authz win32dll)
set_module_type(authz win32dll UNICODE)
add_importlibs(authz advapi32 msvcrt kernel32 ntdll)
add_pch(authz precomp.h)

View file

@ -1,14 +1,13 @@
spec2def(avicap32.dll avicap32.spec)
set_unicode()
add_library(avicap32 SHARED
avicap32.c
avicap32.rc
${CMAKE_CURRENT_BINARY_DIR}/avicap32.def)
set_module_type(avicap32 win32dll)
set_module_type(avicap32 win32dll UNICODE)
target_link_libraries(avicap32 wine)

View file

@ -1,7 +1,6 @@
spec2def(batt.dll batt.spec)
set_unicode()
set_rc_compiler()
add_library(batt SHARED
@ -9,7 +8,7 @@ add_library(batt SHARED
batt.rc
${CMAKE_CURRENT_BINARY_DIR}/batt.def)
set_module_type(batt win32dll)
set_module_type(batt win32dll UNICODE)
add_importlib_target(batt.spec)

View file

@ -1,6 +1,4 @@
set_unicode()
spec2def(beepmidi.dll beepmidi.spec)
list(APPEND SOURCE
@ -9,7 +7,8 @@ list(APPEND SOURCE
add_library(beepmidi SHARED ${SOURCE})
set_entrypoint(beepmidi 0)
set_module_type(beepmidi win32dll ENTRYPOINT 0 UNICODE)
add_importlibs(beepmidi winmm kernel32 ntdll msvcrt)
add_importlib_target(beepmidi.spec)

Some files were not shown because too many files have changed in this diff Show more