Author: akhaldi
Date: Sun Apr 17 16:54:57 2011
New Revision: 51381
URL: http://svn.reactos.org/svn/reactos?rev=51381&view=rev
Log:
[CMAKE]
* Adopt the retar, I mean, actual way of handling resource files. This is a
temporary measure until a windres issue is fixed.
Modified:
branches/cmake-bringup/CMakeLists.txt
branches/cmake-bringup/base/applications/cacls/CMakeLists.txt
branches/cmake-bringup/base/applications/calc/CMakeLists.txt
branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
branches/cmake-bringup/base/applications/control/CMakeLists.txt
branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt
branches/cmake-bringup/base/applications/fontview/CMakeLists.txt
branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt
branches/cmake-bringup/base/applications/hh/CMakeLists.txt
branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt
branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt
branches/cmake-bringup/base/applications/magnify/CMakeLists.txt
branches/cmake-bringup/base/applications/mmc/CMakeLists.txt
branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt
branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt
branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt
branches/cmake-bringup/base/applications/regedit/CMakeLists.txt
branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt
branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt
branches/cmake-bringup/base/applications/taskmgr/rsrc.rc
branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt
branches/cmake-bringup/base/setup/reactos/CMakeLists.txt
branches/cmake-bringup/base/shell/cmd/CMakeLists.txt
branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt
branches/cmake-bringup/base/system/msiexec/CMakeLists.txt
branches/cmake-bringup/base/system/runonce/CMakeLists.txt
branches/cmake-bringup/dll/cpl/access/CMakeLists.txt
branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt
branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt
branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt
branches/cmake-bringup/dll/cpl/input/CMakeLists.txt
branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt
branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt
branches/cmake-bringup/dll/cpl/main/CMakeLists.txt
branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt
branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt
branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt
branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt
branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt
branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt
branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt
branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt
branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt
branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt
branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt
branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt
branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt
branches/cmake-bringup/dll/win32/batt/CMakeLists.txt
branches/cmake-bringup/dll/win32/cards/CMakeLists.txt
branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt
branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt
branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt
branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt
branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt
branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
branches/cmake-bringup/dll/win32/localui/CMakeLists.txt
branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt
branches/cmake-bringup/dll/win32/msi/CMakeLists.txt
branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt
branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt
branches/cmake-bringup/dll/win32/netid/CMakeLists.txt
branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt
branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt
branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt
branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt
branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt
branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt
branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt
branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt
branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc
branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc
branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt
branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt
branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt
branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt
branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt
branches/cmake-bringup/gcc.cmake
branches/cmake-bringup/tools/CMakeLists.txt
Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -58,7 +58,7 @@
add_subdirectory(lib)
if(NOT MSVC)
- export(TARGETS widl gendib cabman cdmake mkhive spec2def geninc FILE
${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+ export(TARGETS widl wrc gendib cabman cdmake mkhive spec2def geninc
FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
else()
export(TARGETS gendib cabman cdmake mkhive spec2def geninc FILE
${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
endif()
Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cacls/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1]
Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
list(APPEND SOURCE cacls.c cacls.rc)
Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/calc/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1]
Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
Modified: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/charmap/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
list(APPEND SOURCE
about.c
Modified:
branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(doskey doskey.c doskey.rc)
Modified: branches/cmake-bringup/base/applications/control/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/control/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/control/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/control/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(control control.c control.rc)
Modified: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1]
Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
list(APPEND SOURCE
system.c
Modified: branches/cmake-bringup/base/applications/fontview/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/fontview/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/fontview/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/fontview/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,4 +1,5 @@
+set_rc_compiler()
add_executable(fontview
display.c
fontview.c
Modified:
branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,6 +1,7 @@
set_unicode()
set_cpp()
+set_rc_compiler()
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
Modified: branches/cmake-bringup/base/applications/hh/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/hh/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,4 +1,5 @@
+set_rc_compiler()
add_executable(hh main.c hh.rc)
set_module_type(hh win32gui)
add_importlibs(hh gdi32 user32 msvcrt kernel32)
Modified: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,4 +1,5 @@
+set_rc_compiler()
add_executable(iexplore main.c iexplore.rc)
set_module_type(iexplore win32gui)
add_importlibs(iexplore shdocvw msvcrt kernel32)
Modified: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(kbswitch kbswitch.c kbswitch.rc)
Modified: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/magnify/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/magnify/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,3 +1,5 @@
+
+set_rc_compiler()
add_executable(magnify
magnifier.c
Modified: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/mmc/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1]
Sun Apr 17 16:54:57 2011
@@ -1,4 +1,5 @@
+set_rc_compiler()
set_unicode()
list(APPEND SOURCE
Modified: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(mplay32 mplay32.c mplay32.rc)
Modified: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
list(APPEND SOURCE
toolspage.c
Modified:
branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
list(APPEND SOURCE
about.c
Modified: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/regedit/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -2,6 +2,7 @@
add_definitions(-D_DLL -D__USE_CRTIMP)
set_unicode()
+set_rc_compiler()
include_directories(BEFORE .)
Modified: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(regedt32 regedt32.c resource.rc)
Modified: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
list(APPEND SOURCE
about.c
Modified: branches/cmake-bringup/base/applications/taskmgr/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/taskmgr/rsrc.rc?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/taskmgr/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/taskmgr/rsrc.rc [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -10,7 +10,7 @@
#include "lang/hu-HU.rc"
#include "lang/id-ID.rc"
#include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+// #include "lang/ja-JP.rc" Error: Invalid character in string
'ÃåIÃåvÃåVÃåÔÇíÃåÔÇ(&O)' for codepage 932
#include "lang/ko-KR.rc"
#include "lang/no-NO.rc"
#include "lang/nl-NL.rc"
Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,3 +1,5 @@
+
+set_rc_compiler()
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
Modified: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reactos/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(reactos reactos.c reactos.rc)
Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -6,6 +6,8 @@
-D_DEBUG_MEM)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
list(APPEND SOURCE main.c cmd.rc)
Modified: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1]
Sun Apr 17 16:54:57 2011
@@ -2,6 +2,8 @@
set_unicode()
add_definitions(-DWIN32)
+
+set_rc_compiler()
list(APPEND SOURCE
desktop.c
Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiexec/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -4,6 +4,8 @@
-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
+
+set_rc_compiler()
add_executable(msiexec
msiexec.c
Modified: branches/cmake-bringup/base/system/runonce/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runonce/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_executable(runonce runonce.c runonce.rc)
Modified: branches/cmake-bringup/dll/cpl/access/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/access/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/access/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/access/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(access.cpl access.spec)
Modified: branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(appwiz.cpl appwiz.spec)
Modified: branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -5,6 +5,7 @@
-D_WIN32
-D_DLL -D__USE_CRTIMP)
+set_rc_compiler()
spec2def(desk.cpl desk.spec)
add_library(desk SHARED
Modified: branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(hdwwiz.cpl hdwwiz.spec)
Modified: branches/cmake-bringup/dll/cpl/input/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/input/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/input/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/input/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(input.dll input.spec)
Modified: branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_definitions(-D_DLL -D__USE_CRTIMP)
Modified: branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(joy.cpl joy.spec)
Modified: branches/cmake-bringup/dll/cpl/main/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/main/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/main/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/main/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_definitions(-D_DLL -D__USE_CRTIMP)
Modified: branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_definitions(-D_DLL -D__USE_CRTIMP)
Modified: branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(powercfg.cpl powercfg.spec)
Modified: branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(sysdm.cpl sysdm.spec)
Modified: branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(telephon.cpl telephon.spec)
Modified: branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(timedate.cpl timedate.spec)
Modified: branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -2,6 +2,8 @@
set_unicode()
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(usrmgr.cpl usrmgr.spec)
Modified: branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,6 +1,6 @@
set_unicode()
-
+set_rc_compiler()
spec2def(deskadp.dll deskadp.spec)
list(APPEND SOURCE
Modified: branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(deskmon.dll deskmon.spec)
Modified: branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(devcpux.dll devcpux.spec)
Modified: branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,6 +1,6 @@
set_unicode()
-
+set_rc_compiler()
spec2def(fontext.dll fontext.spec)
add_library(fontext SHARED
Modified: branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(slayer.dll slayer.spec)
Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,6 +1,6 @@
set_unicode()
-
+set_rc_compiler()
spec2def(acledit.dll acledit.spec)
list(APPEND SOURCE
Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,6 +1,6 @@
spec2def(aclui.dll aclui.spec)
-
+set_rc_compiler()
set_unicode()
add_definitions(-DSUPPORT_UXTHEME)
Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -7,6 +7,8 @@
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(avifil32.dll avifil32.spec)
Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -2,6 +2,7 @@
spec2def(batt.dll batt.spec)
set_unicode()
+set_rc_compiler()
add_library(batt SHARED
batt.c
Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -3,6 +3,8 @@
# Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN
add_definitions(-DCARDSTYLE_DEFAULT)
+
+set_rc_compiler()
spec2def(cards.dll cards.spec)
Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
add_definitions(
-D__WINESRC__
Modified: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(devmgr.dll devmgr.spec)
Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -6,6 +6,7 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+set_rc_compiler()
spec2def(hhctrl.ocx hhctrl.ocx.spec)
add_library(hhctrl SHARED
Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -2,6 +2,8 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(iccvid.dll iccvid.spec)
Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -14,6 +14,8 @@
-Disnan=_isnan)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(jscript.dll jscript.spec)
Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -5,6 +5,10 @@
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
+
+set_rc_compiler()
+
+set_rc_compiler()
spec2def(kernel32.dll kernel32.spec)
Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,6 +1,8 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(localui.dll localui.spec)
Modified: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,6 @@
set_unicode()
+set_rc_compiler()
spec2def(modemui.dll modemui.spec)
Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -5,6 +5,7 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
+set_rc_compiler()
spec2def(msi.dll msi.spec)
generate_idl_iids(msiserver.idl)
Modified: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -4,6 +4,8 @@
-D_DLL -D__USE_CRTIMP)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(msrle32.dll msrle32.spec)
Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -8,6 +8,8 @@
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
generate_idl_iids(mstask_local.idl)
Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,5 +1,6 @@
spec2def(netid.dll netid.spec)
+set_rc_compiler()
list(APPEND SOURCE
netid.c
Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,3 +1,5 @@
+
+set_rc_compiler()
spec2def(ole32.dll ole32.spec)
generate_idl_iids(dcom.idl)
Modified: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,6 +1,8 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
generate_idl_iids(qmgr_local.idl)
Modified: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,4 +1,5 @@
+set_rc_compiler()
spec2def(rasdlg.dll rasdlg.spec)
list(APPEND SOURCE
Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -6,6 +6,7 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(riched20.dll riched20.spec)
+set_rc_compiler()
list(APPEND SOURCE
caret.c
Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,6 +1,6 @@
set_unicode()
-
+set_rc_compiler()
spec2def(serialui.dll serialui.spec)
list(APPEND SOURCE
Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,7 +1,10 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+set_rc_compiler()
spec2def(shdoclc.dll shdoclc.spec)
+
+set_rc_compiler()
add_library(shdoclc SHARED rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def)
Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -4,6 +4,8 @@
add_definitions(-D_SHDOCVW_)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(shdocvw.dll shdocvw.spec)
Modified: branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,4 +1,5 @@
+set_rc_compiler()
spec2def(shimgvw.dll shimgvw.spec)
list(APPEND SOURCE
Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -32,17 +32,17 @@
{
LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
- CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW,
5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ne jelenÃ&tse meg ezt az üzenetet mégegyszer",
IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
STRINGTABLE
{
- IDS_BYTES_FORMAT "%ld bájt"
- IDS_TIME_INTERVAL_HOURS " óra"
+ IDS_BYTES_FORMAT "%ld bájt"
+ IDS_TIME_INTERVAL_HOURS " óra"
IDS_TIME_INTERVAL_MINUTES " perc"
IDS_TIME_INTERVAL_SECONDS " mp"
}
Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -2,8 +2,8 @@
* Portuguese resources for shlwapi
*
* Copyright 2004 Marcelo Duarte
- * Copyright 2006 Américo José Melo
- * Copyright 2010 Gustavo Henrique Milaré
+ * Copyright 2006 Américo José Melo
+ * Copyright 2010 Gustavo Henrique Milaré
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -33,11 +33,11 @@
{
LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20
LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8
- CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20,
210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20,
210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
- PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
STRINGTABLE
Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -1,6 +1,9 @@
+
+set_rc_compiler()
+
+set_rc_compiler()
add_library(tapiui SHARED tapiui.rc)
set_entrypoint(tapiui 0)
add_dependencies(tapiui psdk)
-
add_cab_target(tapiui 1)
Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sun Apr
17 16:54:57 2011
@@ -5,6 +5,8 @@
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+set_rc_compiler()
spec2def(urlmon.dll urlmon.spec)
Modified: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Sun
Apr 17 16:54:57 2011
@@ -1,5 +1,7 @@
spec2def(userenv.dll userenv.spec)
+
+set_rc_compiler()
list(APPEND SOURCE
desktop.c
Modified: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -2,6 +2,7 @@
include_directories(inc)
set_cpp()
+set_rc_compiler()
add_library(uniata SHARED
id_ata.cpp
Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt
[iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt
[iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -1,3 +1,5 @@
+
+set_rc_compiler()
add_library(buslogic SHARED BusLogic958.c BusLogic958.rc)
Modified: branches/cmake-bringup/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Apr 17 16:54:57 2011
@@ -10,7 +10,14 @@
# -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT}
-Wl,--disable-stdcall-fixup")
-set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE>
<CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk
-I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/
-I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos
-I${REACTOS_SOURCE_DIR}/include/reactos/wine
-I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32
-O coff -o <OBJECT>")
+#set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE>
<CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk
-I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/
-I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos
-I${REACTOS_SOURCE_DIR}/include/reactos/wine
-I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32
-O coff -o <OBJECT>")
+
+# Temporary, until windres issues are fixed
+get_target_property(WRC native-wrc IMPORTED_LOCATION_NOCONFIG)
+set(CMAKE_RC_COMPILE_OBJECT
+ "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 <DEFINES>
-I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk
-I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos
-I${REACTOS_BINARY_DIR}/include/reactos
-I${REACTOS_SOURCE_DIR}/include/reactos/wine
-I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32
-xc -E <SOURCE> -o <OBJECT>"
+ "${WRC} -i <OBJECT> -o <OBJECT>"
+ "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")
if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS>
<OBJECTS>")
@@ -190,7 +197,7 @@
endif(NOT IS_UNICODE)
target_link_libraries(${MODULE} mingw_common)
elseif(${TYPE} MATCHES win32dll)
- set_entrypoint(${MODULE} DllMain 12)
+ set_entrypoint(${MODULE} DllMain 12)
target_link_libraries(${MODULE} mingw_dllmain mingw_common)
if(DEFINED baseaddress_${MODULE})
set_image_base(${MODULE} ${baseaddress_${MODULE}})
@@ -236,7 +243,11 @@
set(rc_result_incs "-I${arg} ${rc_result_incs}")
endforeach()
- set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs}
${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
+ #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs}
${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>")
+ set(CMAKE_RC_COMPILE_OBJECT
+ "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1
${rc_result_defs} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -xc -E
<SOURCE> -o <OBJECT>"
+ "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} -i <OBJECT> -o <OBJECT>"
+ "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>")
endmacro()
#idl files support
Modified: branches/cmake-bringup/tools/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.txt?rev=51381&r1=51380&r2=51381&view=diff
==============================================================================
--- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Apr 17
16:54:57 2011
@@ -10,6 +10,7 @@
add_subdirectory(unicode)
if(NOT MSVC)
+add_subdirectory(widl)
add_subdirectory(wpp)
-add_subdirectory(widl)
+add_subdirectory(wrc)
endif()
