Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[jgardou] 53560: [ROSTESTS] - rostests side of r53559 - remove some definitions instead of just staring at the compiler emitting warnings

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 19:19:57 2011 New Revision: 53560 URL: http://svn.reactos.org/svn/reactos?rev=53560&view=rev Log: [ROSTESTS] - rostests side of r53559 - remove some definitions instead of just staring at the compiler emitting warnings Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/winetests/shell32/CMakeLists.txt trunk/rostests/winetests/shlwapi/CMakeLists.txt Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Sat Sep 3 19:19:57 2011 @@ -1,5 +1,4 @@ -set_unicode() set_cpp() list(APPEND SOURCE @@ -21,7 +20,7 @@ add_executable(rosautotest ${SOURCE}) -set_module_type(rosautotest win32cui) +set_module_type(rosautotest win32cui UNICODE) add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll) add_pch(rosautotest precomp.h) Modified: trunk/rostests/winetests/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/CMakeLists.txt [iso-8859-1] Sat Sep 3 19:19:57 2011 @@ -1,6 +1,5 @@ -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x501) +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) add_definitions( -D__ROS_LONG64__ Modified: trunk/rostests/winetests/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/CMakeLi… ============================================================================== --- trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/CMakeLists.txt [iso-8859-1] Sat Sep 3 19:19:57 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) list(APPEND SOURCE assoc.c

13 years, 2 months

[jgardou] 53559: [CMAKE] - get rid of set_unicode macro. - Add an option to set_module_type to do the work instead - Improve debug output

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 19:11:44 2011 New Revision: 53559 URL: http://svn.reactos.org/svn/reactos?rev=53559&view=rev Log: [CMAKE] - get rid of set_unicode macro. - Add an option to set_module_type to do the work instead - Improve debug output Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/charmap/CMakeLists.txt trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt trunk/reactos/base/applications/cmdutils/lodctr/CMakeLists.txt trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt trunk/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt trunk/reactos/base/applications/control/CMakeLists.txt trunk/reactos/base/applications/dxdiag/CMakeLists.txt trunk/reactos/base/applications/extrac32/CMakeLists.txt trunk/reactos/base/applications/games/solitaire/CMakeLists.txt trunk/reactos/base/applications/games/spider/CMakeLists.txt trunk/reactos/base/applications/kbswitch/CMakeLists.txt trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt trunk/reactos/base/applications/mmc/CMakeLists.txt trunk/reactos/base/applications/mplay32/CMakeLists.txt trunk/reactos/base/applications/msconfig/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt trunk/reactos/base/applications/mspaint/CMakeLists.txt trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/network/dwnl/CMakeLists.txt trunk/reactos/base/applications/network/ping/CMakeLists.txt trunk/reactos/base/applications/network/route/CMakeLists.txt trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/regedit/CMakeLists.txt trunk/reactos/base/applications/regedit/clb/CMakeLists.txt trunk/reactos/base/applications/regedt32/CMakeLists.txt trunk/reactos/base/applications/sc/CMakeLists.txt trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt trunk/reactos/base/applications/sndrec32/CMakeLists.txt trunk/reactos/base/applications/sndvol32/CMakeLists.txt trunk/reactos/base/applications/taskmgr/CMakeLists.txt trunk/reactos/base/applications/winver/CMakeLists.txt trunk/reactos/base/applications/write/CMakeLists.txt trunk/reactos/base/services/audiosrv/CMakeLists.txt trunk/reactos/base/services/eventlog/CMakeLists.txt trunk/reactos/base/services/rpcss/CMakeLists.txt trunk/reactos/base/services/spoolsv/CMakeLists.txt trunk/reactos/base/services/tcpsvcs/CMakeLists.txt trunk/reactos/base/services/umpnpmgr/CMakeLists.txt trunk/reactos/base/services/wlansvc/CMakeLists.txt trunk/reactos/base/setup/reactos/CMakeLists.txt trunk/reactos/base/setup/setup/CMakeLists.txt trunk/reactos/base/setup/vmwinst/CMakeLists.txt trunk/reactos/base/setup/welcome/CMakeLists.txt trunk/reactos/base/shell/cmd/CMakeLists.txt trunk/reactos/base/shell/explorer-new/CMakeLists.txt trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/system/bootok/CMakeLists.txt trunk/reactos/base/system/lsass/CMakeLists.txt trunk/reactos/base/system/regsvr32/CMakeLists.txt trunk/reactos/base/system/rundll32/CMakeLists.txt trunk/reactos/base/system/runonce/CMakeLists.txt trunk/reactos/base/system/services/CMakeLists.txt trunk/reactos/base/system/userinit/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/compilerflags.cmake trunk/reactos/dll/cpl/access/CMakeLists.txt trunk/reactos/dll/cpl/appwiz/CMakeLists.txt trunk/reactos/dll/cpl/console/CMakeLists.txt trunk/reactos/dll/cpl/desk/CMakeLists.txt trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt trunk/reactos/dll/cpl/input/CMakeLists.txt trunk/reactos/dll/cpl/intl/CMakeLists.txt trunk/reactos/dll/cpl/joy/CMakeLists.txt trunk/reactos/dll/cpl/main/CMakeLists.txt trunk/reactos/dll/cpl/mmsys/CMakeLists.txt trunk/reactos/dll/cpl/ncpa/CMakeLists.txt trunk/reactos/dll/cpl/odbccp32/CMakeLists.txt trunk/reactos/dll/cpl/powercfg/CMakeLists.txt trunk/reactos/dll/cpl/sysdm/CMakeLists.txt trunk/reactos/dll/cpl/telephon/CMakeLists.txt trunk/reactos/dll/cpl/timedate/CMakeLists.txt trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt trunk/reactos/dll/directx/devenum/CMakeLists.txt trunk/reactos/dll/directx/dinput/CMakeLists.txt trunk/reactos/dll/directx/dinput8/CMakeLists.txt trunk/reactos/dll/directx/dmusic/CMakeLists.txt trunk/reactos/dll/directx/dplay/CMakeLists.txt trunk/reactos/dll/directx/dxdiagn/CMakeLists.txt trunk/reactos/dll/directx/msdmo/CMakeLists.txt trunk/reactos/dll/directx/qedit/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/shellext/deskadp/CMakeLists.txt trunk/reactos/dll/shellext/deskmon/CMakeLists.txt trunk/reactos/dll/shellext/devcpux/CMakeLists.txt trunk/reactos/dll/shellext/fontext/CMakeLists.txt trunk/reactos/dll/shellext/slayer/CMakeLists.txt trunk/reactos/dll/win32/acledit/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/authz/CMakeLists.txt trunk/reactos/dll/win32/avicap32/CMakeLists.txt trunk/reactos/dll/win32/batt/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/cards/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/gdi32/CMakeLists.txt trunk/reactos/dll/win32/getuname/CMakeLists.txt trunk/reactos/dll/win32/hid/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/lpk/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/mmdrv/CMakeLists.txt trunk/reactos/dll/win32/modemui/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt trunk/reactos/dll/win32/msafd/CMakeLists.txt trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/netevent/CMakeLists.txt trunk/reactos/dll/win32/netid/CMakeLists.txt trunk/reactos/dll/win32/newdev/CMakeLists.txt trunk/reactos/dll/win32/ntlanman/CMakeLists.txt trunk/reactos/dll/win32/ntmarta/CMakeLists.txt trunk/reactos/dll/win32/opengl32/CMakeLists.txt trunk/reactos/dll/win32/powrprof/CMakeLists.txt trunk/reactos/dll/win32/samsrv/CMakeLists.txt trunk/reactos/dll/win32/security/CMakeLists.txt trunk/reactos/dll/win32/serialui/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/sndblst/CMakeLists.txt trunk/reactos/dll/win32/syssetup/CMakeLists.txt trunk/reactos/dll/win32/t2embed/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/vdmdbg/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt trunk/reactos/dll/win32/wing32/CMakeLists.txt trunk/reactos/dll/win32/winspool/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/CMakeLists.txt trunk/reactos/dll/win32/wshirda/CMakeLists.txt trunk/reactos/dll/win32/wshtcpip/CMakeLists.txt trunk/reactos/dll/win32/wsock32/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/CM… Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… Modified: trunk/reactos/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/lodctr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Modified: trunk/reactos/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/C… Modified: trunk/reactos/base/applications/extrac32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/extrac32… Modified: trunk/reactos/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/kbswitch/kbsdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/CMak… Modified: trunk/reactos/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… Modified: trunk/reactos/base/applications/network/dwnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/route/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… Modified: trunk/reactos/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/clb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedt32… Modified: trunk/reactos/base/applications/sc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/CMake… Modified: trunk/reactos/base/applications/screensavers/3dtext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/screensavers/logon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndrec32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winver/C… Modified: trunk/reactos/base/applications/write/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/CM… Modified: trunk/reactos/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/CMa… Modified: trunk/reactos/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/CMa… Modified: trunk/reactos/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/rpcss/CMakeL… Modified: trunk/reactos/base/services/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/spoolsv/CMak… Modified: trunk/reactos/base/services/tcpsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/CMak… Modified: trunk/reactos/base/services/umpnpmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/CMa… Modified: trunk/reactos/base/services/wlansvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/CMak… Modified: trunk/reactos/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/CMakeLi… Modified: trunk/reactos/base/setup/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/setup/CMakeList… Modified: trunk/reactos/base/setup/vmwinst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/CMakeLi… Modified: trunk/reactos/base/setup/welcome/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/CMakeLi… Modified: trunk/reactos/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/CMakeLists.… Modified: trunk/reactos/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/CM… Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… Modified: trunk/reactos/base/system/bootok/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/bootok/CMakeLi… Modified: trunk/reactos/base/system/lsass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/CMakeLis… Modified: trunk/reactos/base/system/regsvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/CMake… Modified: trunk/reactos/base/system/rundll32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/CMake… Modified: trunk/reactos/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/CMakeL… Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… Modified: trunk/reactos/base/system/userinit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/CMake… Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… Modified: trunk/reactos/dll/cpl/access/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/CMakeLists.… Modified: trunk/reactos/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/CMakeLists.… Modified: trunk/reactos/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/CMakeLists… Modified: trunk/reactos/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/hdwwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/CMakeLists.… Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… Modified: trunk/reactos/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/CMakeLists.t… Modified: trunk/reactos/dll/cpl/intl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/joy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/CMakeLists.txt… Modified: trunk/reactos/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/CMakeLists.t… Modified: trunk/reactos/dll/cpl/ncpa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/CMakeLists.tx… Modified: trunk/reactos/dll/cpl/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/odbccp32/CMakeList… Modified: trunk/reactos/dll/cpl/powercfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/CMakeList… Modified: trunk/reactos/dll/cpl/sysdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/CMakeLists.t… Modified: trunk/reactos/dll/cpl/telephon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/CMakeList… Modified: trunk/reactos/dll/cpl/timedate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/CMakeList… Modified: trunk/reactos/dll/cpl/usrmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/CMakeLists.… Modified: trunk/reactos/dll/directx/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/CMakeL… Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/CMakeLi… Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/CMakeL… Modified: trunk/reactos/dll/directx/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dmusic/CMakeLi… Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/CMakeLis… Modified: trunk/reactos/dll/directx/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/CMakeL… Modified: trunk/reactos/dll/directx/msdmo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/CMakeLis… Modified: trunk/reactos/dll/directx/qedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/CMakeLis… Modified: trunk/reactos/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/CMak… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/CMake… Modified: trunk/reactos/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/CMake… Modified: trunk/reactos/dll/shellext/devcpux/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/devcpux/CMake… Modified: trunk/reactos/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/fontext/CMake… Modified: trunk/reactos/dll/shellext/slayer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/CMakeL… Modified: trunk/reactos/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/CMakeLis… Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… Modified: trunk/reactos/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/CMakeLists… Modified: trunk/reactos/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/CMakeLi… Modified: trunk/reactos/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/CMakeLists.… Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… Modified: trunk/reactos/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/CMakeLists… Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… Modified: trunk/reactos/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/CMakeLists… Modified: trunk/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/CMakeLi… Modified: trunk/reactos/dll/win32/hid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/CMakeLists.t… Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… Modified: trunk/reactos/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/CMakeLists.t… Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… Modified: trunk/reactos/dll/win32/mmdrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/CMakeLists… Modified: trunk/reactos/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/CMakeLis… Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… Modified: trunk/reactos/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… Modified: trunk/reactos/dll/win32/msafd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/CMakeLists… Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… Modified: trunk/reactos/dll/win32/netevent/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/CMakeLi… Modified: trunk/reactos/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/CMakeLists… Modified: trunk/reactos/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/CMakeList… Modified: trunk/reactos/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntlanman/CMakeLi… Modified: trunk/reactos/dll/win32/ntmarta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/CMakeLis… Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLi… Modified: trunk/reactos/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/CMakeLi… Modified: trunk/reactos/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/CMakeList… Modified: trunk/reactos/dll/win32/security/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/CMakeLi… Modified: trunk/reactos/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/CMakeLi… Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… Modified: trunk/reactos/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sndblst/CMakeLis… Modified: trunk/reactos/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/CMakeLi… Modified: trunk/reactos/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/CMakeLis… Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… Modified: trunk/reactos/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vdmdbg/CMakeList… Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/CMake… Modified: trunk/reactos/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wing32/CMakeList… Modified: trunk/reactos/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/CMakeLi… Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… Modified: trunk/reactos/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/CMakeLis… Modified: trunk/reactos/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/CMakeLi… Modified: trunk/reactos/dll/win32/wsock32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/CMakeLis…

13 years, 2 months

[tfaber] 53558: [CMAKE] - Replace add_linkerflag and add_compiler_flags with their new equivalents add_target_link_flags/add_compile_flags - Remove those now obsolete macros - Use the new set_modul...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Sep 3 18:59:14 2011 New Revision: 53558 URL: http://svn.reactos.org/svn/reactos?rev=53558&view=rev Log: [CMAKE] - Replace add_linkerflag and add_compiler_flags with their new equivalents add_target_link_flags/add_compile_flags - Remove those now obsolete macros - Use the new set_module_type to get rid of evil hacks for drivers without entry point (wmilib, drmk) Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/compilerflags.cmake trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt trunk/reactos/drivers/wmi/CMakeLists.txt trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt trunk/reactos/lib/newinflib/CMakeLists.txt trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=53558&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -52,7 +52,7 @@ endif() add_definitions(/Dinline=__inline) else() - add_compiler_flags(-fshort-wchar) + add_compile_flags("-fshort-wchar") endif() include_directories(include/host) Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -24,33 +24,8 @@ set_property(TARGET ${_module} PROPERTY ${_propname} ${_newvalue}) endfunction() -# -# For backwards compatibility. To be removed soon. -# -function(add_compiler_flags) - set(flags_list "") - # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS - foreach(flag ${ARGN}) - set(flags_list "${flags_list} ${flag}") - endforeach() - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags_list}" PARENT_SCOPE) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags_list}" PARENT_SCOPE) -endfunction() - -function(add_linkerflag MODULE _flag) - if (${ARGC} GREATER 2) - message(STATUS "Excess arguments to add_linkerflag! Module ${MODULE}, args ${ARGN}") - endif() - set(NEW_LINKER_FLAGS ${_flag}) - get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) - if(LINKER_FLAGS) - set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") - endif() - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) -endfunction() - -# New versions, using add_target_property where appropriate. +# Wrapper functions for the important properties, using add_target_property +# where appropriate. # Note that the functions for string properties take a single string # argument while those for list properties can take a variable number of # arguments, all of which will be added to the list @@ -59,7 +34,7 @@ # add_compile_flags("-pedantic -O5") # add_target_link_flags(mymodule "-s --fatal-warnings") # add_target_compile_flags(mymodule "-pedantic -O5") -# add_target_compile_definitions(mymodule WIN32 _WIN32) +# add_target_compile_definitions(mymodule WIN32 _WIN32 INLINE=inline) # add_target_include_directories(mymodule include ../include) function(add_compile_flags _flags) if (${ARGC} GREATER 1) Modified: trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/CMakeL… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -1,6 +1,6 @@ if(NOT MSVC) - add_compiler_flags(-w) + add_compile_flags("-w") endif() add_definitions( Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -39,7 +39,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0) if(MSVC) - add_linkerflag(ntdll /RELEASE) + add_target_link_flags(ntdll "/RELEASE") endif() target_link_libraries(ntdll Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -7,7 +7,7 @@ -DROS_Headers) if (MSVC) - add_compiler_flags(/EHa-) + add_compile_flags("/EHa-") endif() remove_definitions(-D_WIN32_WINNT=0x502) Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -31,7 +31,7 @@ if(MSVC) # export of deleting destructor "name" - add_linkerflag(msvcrt "/ignore:4102") + add_target_link_flags(msvcrt "/ignore:4102") endif() add_importlibs(msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -28,7 +28,7 @@ if(MSVC) # export of deleting destructor "name" - add_linkerflag(msvcrt20 "/ignore:4102") + add_target_link_flags(msvcrt20 "/ignore:4102") endif() add_importlibs(msvcrt20 kernel32 ntdll) Modified: trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -29,7 +29,7 @@ if(MSVC) # export of deleting destructor "name" - add_linkerflag(msvcrt40 "/ignore:4102") + add_target_link_flags(msvcrt40 "/ignore:4102") endif() add_importlibs(msvcrt40 kernel32 ntdll) Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -11,7 +11,7 @@ -DLIBXML_STATIC) if(MSVC) - add_compiler_flags(/FIwine/typeof.h /FImsvc.h) + add_compile_flags("/FIwine/typeof.h /FImsvc.h") endif(MSVC) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -13,7 +13,7 @@ set_rc_compiler() if(MSVC) - add_compiler_flags(/FItypeof.h) + add_compile_flags("/FItypeof.h") endif() spec2def(windowscodecs.dll windowscodecs.spec) Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -10,18 +10,8 @@ add_library(drmk SHARED ${SOURCE}) -if(NOT MSVC) - set_module_type(drmk kernelmodedriver) -else() - set_target_properties(drmk PROPERTIES SUFFIX ".sys") - set_subsystem(drmk native) - set_image_base(drmk 0x00010000) - add_linkerflag(drmk "/DRIVER") - add_dependencies(drmk bugcodes) - add_dependencies(drmk psdk) -endif() +set_module_type(drmk kernelmodedriver ENTRYPOINT 0) -set_entrypoint(drmk 0) add_importlibs(drmk ntoskrnl) add_importlib_target(drmk.spec) add_cd_file(TARGET drmk DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wmi/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -8,19 +8,8 @@ add_library(wmilib SHARED ${SOURCE}) -if(NOT MSVC) - set_module_type(wmilib kernelmodedriver) -else() - set_target_properties(wmilib PROPERTIES SUFFIX ".sys") - set_subsystem(wmilib native) - set_image_base(wmilib 0x00010000) - add_linkerflag(wmilib "/DRIVER") - add_dependencies(wmilib bugcodes) - add_dependencies(wmilib psdk) -endif() +set_module_type(wmilib kernelmodedriver ENTRYPOINT 0) -set_entrypoint(wmilib 0) -set_target_properties(wmilib PROPERTIES SUFFIX ".sys") add_importlibs(wmilib ntoskrnl) add_importlib_target(wmilib.spec) add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers FOR all) Modified: trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/CMakeLi… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -4,7 +4,7 @@ add_definitions(-D_CRTBLD) if(NOT MSVC) - add_definitions(-Wno-main) + add_compile_flags("-Wno-main") endif() list(APPEND MINGW_COMMON_SOURCE Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -22,7 +22,7 @@ add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) if(NOT MSVC) - add_compiler_flags(-Wpointer-arith -Wwrite-strings) + add_compile_flags("-Wpointer-arith -Wwrite-strings") endif() add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) target_link_libraries(inflibhost unicode) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sat Sep 3 18:59:14 2011 @@ -2,7 +2,7 @@ include_directories(include/internal/mingw-w64) if(NOT MSVC) - add_compiler_flags(-Wno-main) + add_compile_flags("-Wno-main") endif() list(APPEND MSVCRTEX_SOURCE

13 years, 2 months

[jgardou] 53557: [CMAKE] - use the new options of set_module_type for a few modules

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 18:26:19 2011 New Revision: 53557 URL: http://svn.reactos.org/svn/reactos?rev=53557&view=rev Log: [CMAKE] - use the new options of set_module_type for a few modules Modified: trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:26:19 2011 @@ -36,7 +36,7 @@ add_library(ntdll SHARED ${SOURCE}) -set_entrypoint(ntdll 0) +set_module_type(ntdll win32dll ENTRYPOINT 0) if(MSVC) add_linkerflag(ntdll /RELEASE) @@ -48,7 +48,6 @@ libcntpr ${PSEH_LIB}) -set_image_base(ntdll ${baseaddress_ntdll}) add_pch(ntdll include/ntdll.h) add_dependencies(ntdll ntstatus asm) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:26:19 2011 @@ -93,8 +93,7 @@ add_library(kernel32 SHARED ${SOURCE}) -set_entrypoint(kernel32 DllMain 12) -set_image_base(kernel32 ${baseaddress_kernel32}) +set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:26:19 2011 @@ -20,8 +20,7 @@ add_library(msacm32 SHARED ${SOURCE}) -set_entrypoint(msacm32 DllMain 12) -set_image_base(msacm32 ${baseaddress_msacm32}) +set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12) target_link_libraries(msacm32 wine) add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:26:19 2011 @@ -23,9 +23,9 @@ add_library(msvcrt SHARED ${SOURCE}) +set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12) + add_dependencies(msvcrt psdk) -set_entrypoint(msvcrt DllMain 12) -set_image_base(msvcrt ${baseaddress_msvcrt}) target_link_libraries(msvcrt crt wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt20/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:26:19 2011 @@ -20,10 +20,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/msvcrt20.def) add_library(msvcrt20 SHARED ${SOURCE}) +set_module_type(msvcrt20 win32dll ENTRYPOINT DllMain 12) add_dependencies(msvcrt20 psdk) -set_entrypoint(msvcrt20 DllMain 12) -set_image_base(msvcrt20 ${baseaddress_msvcrt20}) target_link_libraries(msvcrt20 crt wine ${PSEH_LIB}) Modified: trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt40/CMakeLists.txt [iso-8859-1] Sat Sep 3 18:26:19 2011 @@ -21,9 +21,9 @@ add_library(msvcrt40 SHARED ${SOURCE}) +set_module_type(msvcrt40 win32dll ENTRYPOINT DllMain 12) + add_dependencies(msvcrt40 psdk) -set_entrypoint(msvcrt40 DllMain 12) -set_image_base(msvcrt40 ${baseaddress_msvcrt40}) target_link_libraries(msvcrt40 crt wine ${PSEH_LIB})

13 years, 2 months

[jgardou] 53556: [CMAKE] - handle '0' entry point in set_module_type_function

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 18:24:38 2011 New Revision: 53556 URL: http://svn.reactos.org/svn/reactos?rev=53556&view=rev Log: [CMAKE] - handle '0' entry point in set_module_type_function Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Sep 3 18:24:38 2011 @@ -264,9 +264,10 @@ endif() # set entry point - if(__module_ENTRYPOINT) + 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)

13 years, 2 months

[jgardou] 53555: [CMAKE] - remove add_compiler_flags_target function, Thomas was faster than me, and did something nicer

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 18:16:15 2011 New Revision: 53555 URL: http://svn.reactos.org/svn/reactos?rev=53555&view=rev Log: [CMAKE] - remove add_compiler_flags_target function, Thomas was faster than me, and did something nicer Modified: trunk/reactos/cmake/compilerflags.cmake Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sat Sep 3 18:16:15 2011 @@ -96,14 +96,3 @@ add_definitions(-DUNICODE -D_UNICODE) set(IS_UNICODE 1) endmacro() - -function(add_compiler_flags_target __module) - get_target_property(__flags ${__module} COMPILE_FLAGS) - if(NOT __flags) - set(__flags "") - endif() - foreach(flag ${ARGN}) - set(__flags "${__flags} ${flag}") - endforeach() - set_target_properties(${__module} PROPERTIES COMPILE_FLAGS ${__flags}) -endfunction()

13 years, 2 months

[gadamopoulos] 53554: [win32k] - SetWindowPos should send WM_MOUSEMOVE only when the window under the cursor changes - Fixes moving winamp window

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Sep 3 17:53:14 2011 New Revision: 53554 URL: http://svn.reactos.org/svn/reactos?rev=53554&view=rev Log: [win32k] - SetWindowPos should send WM_MOUSEMOVE only when the window under the cursor changes - Fixes moving winamp window Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Sat Sep 3 17:53:14 2011 @@ -950,6 +950,7 @@ HDC Dc; RECTL CopyRect; PWND Ancestor; + BOOL bPointerInWindow; ASSERT_REFS_CO(Window); @@ -963,6 +964,7 @@ { return FALSE; } + bPointerInWindow = IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y); WinPos.hwnd = Window->head.h; WinPos.hwndInsertAfter = WndInsertAfter; @@ -1329,7 +1331,7 @@ IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); } - if(IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y)) + if(bPointerInWindow != IntPtInWindow(Window, gpsi->ptCursor.x, gpsi->ptCursor.y)) { /* Generate mouse move message */ MSG msg;

13 years, 2 months

[jgardou] 53553: [CMAKE] - merge set_module_type function into the global CMakeMacros.cmake file, leaving compiler particular bits to set_module_type_toolchain function. - Add the ENTRYPOINT and BA...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 17:48:57 2011 New Revision: 53553 URL: http://svn.reactos.org/svn/reactos?rev=53553&view=rev Log: [CMAKE] - merge set_module_type function into the global CMakeMacros.cmake file, leaving compiler particular bits to set_module_type_toolchain function. - Add the ENTRYPOINT and BASEADDRESS options to this function. Not used yet Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/compilerflags.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Sep 3 17:48:57 2011 @@ -239,3 +239,96 @@ add_dependency_edge(${_module} ${LIB}) endforeach() endfunction() + +function(set_module_type MODULE TYPE) + cmake_parse_arguments(__module "" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) + + # 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)) + set(__subsystem native) + elseif(${TYPE} STREQUAL win32cui) + set(__subsystem console) + elseif(${TYPE} STREQUAL win32gui) + set(__subsystem windows) + elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl))) + message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") + endif() + + if(DEFINED __subsystem) + set_subsystem(${MODULE} ${__subsystem}) + endif() + + if(__module_UNPARSED_ARGUMENTS) + message(STATUS ${__module_UNPARSED_ARGUMENTS}) + endif() + + # set entry point + if(__module_ENTRYPOINT) + list(GET __module_ENTRYPOINT 0 __entrypoint) + list(LENGTH __module_ENTRYPOINT __length) + if(${__length} EQUAL 2) + list(GET __module_ENTRYPOINT 1 __entrystack) + elseif(NOT ${__length} EQUAL 1) + message(FATAL_ERROR "Wrong arguments for ENTRYPOINT parameter of set_module_type : ${__module_ENTRYPOINT}") + endif() + unset(__length) + elseif(${TYPE} STREQUAL nativecui) + set(__entrypoint NtProcessStartup) + set(__entrystack 4) + elseif((${TYPE} STREQUAL win32gui) OR (${TYPE} STREQUAL win32cui)) + if(IS_UNICODE) + set(__entrypoint wWinMainCRTStartup) + else() + set(__entrypoint WinMainCRTStartup) + endif(IS_UNICODE) + elseif((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) + OR (${TYPE} STREQUAL cpl)) + set(__entrypoint DllMainCRTStartup) + set(__entrystack 12) + elseif(${TYPE} STREQUAL kernelmodedriver) + set(__entrypoint DriverEntry) + set(__entrystack 8) + elseif(${TYPE} STREQUAL nativedll) + set(__entrypoint DllMain) + set(__entrystack 12) + endif() + + if(DEFINED __entrypoint) + if(DEFINED __entrystack) + set_entrypoint(${MODULE} ${__entrypoint} ${__entrystack}) + else() + set_entrypoint(${MODULE} ${__entrypoint}) + endif() + endif() + + #set base address + if(__module_IMAGEBASE) + set_image_base(${MODULE} __module_IMAGEBASE) + elseif(${TYPE} STREQUAL win32dll) + if(DEFINED baseaddress_${MODULE}) + set_image_base(${MODULE} ${baseaddress_${MODULE}}) + else() + message(STATUS "${MODULE} has no base address") + endif() + elseif(${TYPE} STREQUAL kernelmodedriver) + set_image_base(${MODULE} 0x00010000) + endif() + + # Now do some stuff which is specific to each type + if(${TYPE} STREQUAL kernelmodedriver) + add_dependencies(${MODULE} bugcodes) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") + endif() + + if(${TYPE} STREQUAL win32ocx) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") + endif() + + if(${TYPE} STREQUAL cpl) + set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") + endif() + + # do compiler specific stuff + set_module_type_toolchain(${MODULE} ${TYPE}) +endfunction() Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Sat Sep 3 17:48:57 2011 @@ -96,3 +96,14 @@ add_definitions(-DUNICODE -D_UNICODE) set(IS_UNICODE 1) endmacro() + +function(add_compiler_flags_target __module) + get_target_property(__flags ${__module} COMPILE_FLAGS) + if(NOT __flags) + set(__flags "") + endif() + foreach(flag ${ARGN}) + set(__flags "${__flags} ${flag}") + endforeach() + set_target_properties(${__module} PROPERTIES COMPILE_FLAGS ${__flags}) +endfunction() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53553&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Sep 3 17:48:57 2011 @@ -120,55 +120,13 @@ add_target_link_flags(${MODULE} "-Wl,--image-base,${IMAGE_BASE}") endfunction() -function(set_module_type MODULE TYPE) - - add_dependencies(${MODULE} psdk) - if(${IS_CPP}) +function(set_module_type_toolchain MODULE TYPE) + if(IS_CPP) target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) endif() - if(${TYPE} MATCHES nativecui) - set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup 4) - elseif(${TYPE} MATCHES win32gui) - set_subsystem(${MODULE} windows) - if(IS_UNICODE) - set_entrypoint(${MODULE} wWinMainCRTStartup) - else() - set_entrypoint(${MODULE} WinMainCRTStartup) - endif(IS_UNICODE) - elseif(${TYPE} MATCHES win32cui) - set_subsystem(${MODULE} console) - if(IS_UNICODE) - set_entrypoint(${MODULE} wmainCRTStartup) - else() - set_entrypoint(${MODULE} mainCRTStartup) - endif(IS_UNICODE) - elseif(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMainCRTStartup 12) - if(DEFINED baseaddress_${MODULE}) - set_image_base(${MODULE} ${baseaddress_${MODULE}}) - else() - message(STATUS "${MODULE} has no base address") - endif() - elseif(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMainCRTStartup 12) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - elseif(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMainCRTStartup 12) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - elseif(${TYPE} MATCHES kernelmodedriver) + if(${TYPE} STREQUAL kernelmodedriver) add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000") - set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry 8) - set_subsystem(${MODULE} native) - set_image_base(${MODULE} 0x00010000) - add_dependencies(${MODULE} bugcodes) - elseif(${TYPE} MATCHES nativedll) - set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} DllMain 12) - else() - message(FATAL_ERROR "Unknown module type : ${TYPE}") endif() endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53553… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Sep 3 17:48:57 2011 @@ -81,53 +81,11 @@ add_target_link_flags(${MODULE} "/BASE:${IMAGE_BASE}") endfunction() -function(set_module_type MODULE TYPE) - add_dependencies(${MODULE} psdk) - if(${TYPE} MATCHES nativecui) - set_subsystem(${MODULE} native) - set_entrypoint(${MODULE} NtProcessStartup 4) - elseif (${TYPE} MATCHES win32gui) - set_subsystem(${MODULE} windows) - if(IS_UNICODE) - set_entrypoint(${MODULE} wWinMainCRTStartup) - else() - set_entrypoint(${MODULE} WinMainCRTStartup) - endif(IS_UNICODE) - elseif (${TYPE} MATCHES win32cui) - set_subsystem(${MODULE} console) - if(IS_UNICODE) - set_entrypoint(${MODULE} wmainCRTStartup) - else() - set_entrypoint(${MODULE} mainCRTStartup) - endif(IS_UNICODE) - elseif(${TYPE} MATCHES win32dll) - # Need this only because mingw library is broken - set_entrypoint(${MODULE} DllMainCRTStartup 12) - if(DEFINED baseaddress_${MODULE}) - set_image_base(${MODULE} ${baseaddress_${MODULE}}) - else() - message(STATUS "${MODULE} has no base address") - endif() +function(set_module_type_toolchain MODULE TYPE) + if((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl)) add_target_link_flags(${MODULE} "/DLL") - elseif(${TYPE} MATCHES win32ocx) - set_entrypoint(${MODULE} DllMainCRTStartup 12) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - add_target_link_flags(${MODULE} "/DLL") - elseif(${TYPE} MATCHES cpl) - set_entrypoint(${MODULE} DllMainCRTStartup 12) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - add_target_link_flags(${MODULE} "/DLL") - elseif(${TYPE} MATCHES kernelmodedriver) - set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry 8) - set_subsystem(${MODULE} native) - set_image_base(${MODULE} 0x00010000) + elseif(${TYPE} STREQUAL kernelmodedriver) add_target_link_flags(${MODULE} "/DRIVER") - add_dependencies(${MODULE} bugcodes) - elseif(${TYPE} MATCHES nativedll) - set_subsystem(${MODULE} native) - else() - message(FATAL_ERROR "Unknown module type : ${TYPE}") endif() endfunction()

13 years, 2 months

[akhaldi] 53552: [RPCRT4_WINETEST] * Fix msvc build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Sep 3 17:35:54 2011 New Revision: 53552 URL: http://svn.reactos.org/svn/reactos?rev=53552&view=rev Log: [RPCRT4_WINETEST] * Fix msvc build. Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sat Sep 3 17:35:54 2011 @@ -30,6 +30,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/server_c.c ${CMAKE_CURRENT_BINARY_DIR}/server_s.c) +if(MSVC) + # The nmake generator misses this dependency, so set it explicitly until this bug is fixed. + set_source_files_properties(server.c PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/server_s.h) +endif() + add_executable(rpcrt4_winetest ${SOURCE}) target_link_libraries(rpcrt4_winetest uuid

13 years, 2 months

[jgardou] 53551: - revert r53547, although setting explicitly something which is default isn't a "wrong change" per se.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Sep 3 16:44:49 2011 New Revision: 53551 URL: http://svn.reactos.org/svn/reactos?rev=53551&view=rev Log: - revert r53547, although setting explicitly something which is default isn't a "wrong change" per se. Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vga.c [iso-8859-1] Sat Sep 3 16:44:49 2011 @@ -19,7 +19,6 @@ // VP_STATUS -NTAPI VgaFindAdapter( PVOID HwDeviceExtension, PVOID HwContext, @@ -29,13 +28,11 @@ ); BOOLEAN -NTAPI VgaInitialize( PVOID HwDeviceExtension ); BOOLEAN -NTAPI VgaStartIO( PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket @@ -105,7 +102,6 @@ ); VP_STATUS -NTAPI GetDeviceDataCallback( PVOID HwDeviceExtension, PVOID Context, @@ -134,6 +130,7 @@ #pragma alloc_text(PAGE,VgaSetColorLookup) #endif + //--------------------------------------------------------------------------- ULONG // eVb: 1.3 [GCC] - Add NTAPI for GCC support @@ -306,10 +303,9 @@ return initializationStatus; } // end DriverEntry() - + //--------------------------------------------------------------------------- VP_STATUS -NTAPI VgaFindAdapter( PVOID HwDeviceExtension, PVOID HwContext, @@ -387,7 +383,7 @@ if ((ConfigInfo->AdapterInterfaceType == Internal) && (VideoPortGetDeviceData(HwDeviceExtension, VpControllerData, - GetDeviceDataCallback, + &GetDeviceDataCallback, VgaAccessRange) != NO_ERROR)) { return ERROR_INVALID_PARAMETER; @@ -489,10 +485,9 @@ } // VgaFindAdapter() - + //--------------------------------------------------------------------------- BOOLEAN -NTAPI VgaInitialize( PVOID HwDeviceExtension ) @@ -532,10 +527,9 @@ return TRUE; } // VgaInitialize() - + //--------------------------------------------------------------------------- BOOLEAN -NTAPI VgaStartIO( PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket @@ -1446,9 +1440,8 @@ return ERROR_INVALID_PARAMETER; } // end VgaSetColorLookup() - + VP_STATUS -NTAPI GetDeviceDataCallback( PVOID HwDeviceExtension, PVOID Context,

13 years, 2 months

← Newer
1
...
33
34
35
36
37
38
39
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2011