[CMAKE]

* Adopt the retar, I mean, actual way of handling resource files. This is a temporary measure until a windres issue is fixed.

svn path=/branches/cmake-bringup/; revision=51381

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e557280..0746eda 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if(NOT CMAKE_CROSSCOMPILING)
     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()

diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt
index 5be71ef..6ec1bc5 100644 (file)
--- a/base/applications/cacls/CMakeLists.txt
+++ b/base/applications/cacls/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 list(APPEND SOURCE cacls.c cacls.rc)
 

diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt
index 64dcdc9..cfa99b5 100644 (file)
--- a/base/applications/calc/CMakeLists.txt
+++ b/base/applications/calc/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1)
 

diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt
index 37398c0..e2b5201 100644 (file)
--- a/base/applications/charmap/CMakeLists.txt
+++ b/base/applications/charmap/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 list(APPEND SOURCE
     about.c

diff --git a/base/applications/cmdutils/doskey/CMakeLists.txt b/base/applications/cmdutils/doskey/CMakeLists.txt
index eeeac85..62f86c5 100644 (file)
--- a/base/applications/cmdutils/doskey/CMakeLists.txt
+++ b/base/applications/cmdutils/doskey/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(doskey doskey.c doskey.rc)
 

diff --git a/base/applications/control/CMakeLists.txt b/base/applications/control/CMakeLists.txt
index c0d005b..bb6d2e0 100644 (file)
--- a/base/applications/control/CMakeLists.txt
+++ b/base/applications/control/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(control control.c control.rc)
 

diff --git a/base/applications/dxdiag/CMakeLists.txt b/base/applications/dxdiag/CMakeLists.txt
index 68f5718..e5fcc0f 100644 (file)
--- a/base/applications/dxdiag/CMakeLists.txt
+++ b/base/applications/dxdiag/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 list(APPEND SOURCE
     system.c

diff --git a/base/applications/fontview/CMakeLists.txt b/base/applications/fontview/CMakeLists.txt
index 933f804..8be0dea 100644 (file)
--- a/base/applications/fontview/CMakeLists.txt
+++ b/base/applications/fontview/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+set_rc_compiler()
 add_executable(fontview
     display.c
     fontview.c

diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt
index 6050d8c..938a32e 100644 (file)
--- a/base/applications/games/solitaire/CMakeLists.txt
+++ b/base/applications/games/solitaire/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 set_unicode()
 set_cpp()
+set_rc_compiler()
 
 include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
 

diff --git a/base/applications/hh/CMakeLists.txt b/base/applications/hh/CMakeLists.txt
index 48ad8f2..3b78ce5 100644 (file)
--- a/base/applications/hh/CMakeLists.txt
+++ b/base/applications/hh/CMakeLists.txt
@@ -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)

diff --git a/base/applications/iexplore/CMakeLists.txt b/base/applications/iexplore/CMakeLists.txt
index 50b5f9f..fd2c6f1 100644 (file)
--- a/base/applications/iexplore/CMakeLists.txt
+++ b/base/applications/iexplore/CMakeLists.txt
@@ -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)

diff --git a/base/applications/kbswitch/CMakeLists.txt b/base/applications/kbswitch/CMakeLists.txt
index ef0ffda..f48cd9c 100644 (file)
--- a/base/applications/kbswitch/CMakeLists.txt
+++ b/base/applications/kbswitch/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(kbswitch kbswitch.c kbswitch.rc)
 

diff --git a/base/applications/magnify/CMakeLists.txt b/base/applications/magnify/CMakeLists.txt
index e73c2ad..b464189 100644 (file)
--- a/base/applications/magnify/CMakeLists.txt
+++ b/base/applications/magnify/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+set_rc_compiler()
+
 add_executable(magnify
     magnifier.c
     settings.c

diff --git a/base/applications/mmc/CMakeLists.txt b/base/applications/mmc/CMakeLists.txt
index 670e729..765cf2e 100644 (file)
--- a/base/applications/mmc/CMakeLists.txt
+++ b/base/applications/mmc/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+set_rc_compiler()
 set_unicode()
 
 list(APPEND SOURCE

diff --git a/base/applications/mplay32/CMakeLists.txt b/base/applications/mplay32/CMakeLists.txt
index 8c55c45..549df47 100644 (file)
--- a/base/applications/mplay32/CMakeLists.txt
+++ b/base/applications/mplay32/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(mplay32 mplay32.c mplay32.rc)
 

diff --git a/base/applications/msconfig/CMakeLists.txt b/base/applications/msconfig/CMakeLists.txt
index 5a87023..5613489 100644 (file)
--- a/base/applications/msconfig/CMakeLists.txt
+++ b/base/applications/msconfig/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 list(APPEND SOURCE
     toolspage.c

diff --git a/base/applications/mscutils/servman/CMakeLists.txt b/base/applications/mscutils/servman/CMakeLists.txt
index d07d4aa..3cf667b 100644 (file)
--- a/base/applications/mscutils/servman/CMakeLists.txt
+++ b/base/applications/mscutils/servman/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 list(APPEND SOURCE
     about.c

diff --git a/base/applications/regedit/CMakeLists.txt b/base/applications/regedit/CMakeLists.txt
index 95f51a5..411aaea 100644 (file)
--- a/base/applications/regedit/CMakeLists.txt
+++ b/base/applications/regedit/CMakeLists.txt
@@ -2,6 +2,7 @@
 add_definitions(-D_DLL -D__USE_CRTIMP)
 
 set_unicode()
+set_rc_compiler()
 
 include_directories(BEFORE .)
 

diff --git a/base/applications/regedt32/CMakeLists.txt b/base/applications/regedt32/CMakeLists.txt
index 8cb5d04..9dabef7 100644 (file)
--- a/base/applications/regedt32/CMakeLists.txt
+++ b/base/applications/regedt32/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(regedt32 regedt32.c resource.rc)
 

diff --git a/base/applications/taskmgr/CMakeLists.txt b/base/applications/taskmgr/CMakeLists.txt
index 92efa0c..8a78ccc 100644 (file)
--- a/base/applications/taskmgr/CMakeLists.txt
+++ b/base/applications/taskmgr/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 list(APPEND SOURCE
     about.c

diff --git a/base/applications/taskmgr/rsrc.rc b/base/applications/taskmgr/rsrc.rc
index caffbba..13162da 100644 (file)
--- a/base/applications/taskmgr/rsrc.rc
+++ b/base/applications/taskmgr/rsrc.rc
@@ -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ÃåÔÇíÃåÔÇ\9d(&O)' for codepage 932
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

diff --git a/base/applications/winhlp32/CMakeLists.txt b/base/applications/winhlp32/CMakeLists.txt
index 9acd99f..071c768 100644 (file)
--- a/base/applications/winhlp32/CMakeLists.txt
+++ b/base/applications/winhlp32/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+set_rc_compiler()
+
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 add_definitions(

diff --git a/base/setup/reactos/CMakeLists.txt b/base/setup/reactos/CMakeLists.txt
index 5a009d1..3a0ceb6 100644 (file)
--- a/base/setup/reactos/CMakeLists.txt
+++ b/base/setup/reactos/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(reactos reactos.c reactos.rc)
 

diff --git a/base/shell/cmd/CMakeLists.txt b/base/shell/cmd/CMakeLists.txt
index fbd6c1e..97692ba 100644 (file)
--- a/base/shell/cmd/CMakeLists.txt
+++ b/base/shell/cmd/CMakeLists.txt
@@ -7,6 +7,8 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 list(APPEND SOURCE main.c cmd.rc)
 
 list(APPEND SOURCE

diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt
index 2ac2ed9..cd581cc 100644 (file)
--- a/base/shell/explorer-new/CMakeLists.txt
+++ b/base/shell/explorer-new/CMakeLists.txt
@@ -3,6 +3,8 @@ set_unicode()
 
 add_definitions(-DWIN32)
 
+set_rc_compiler()
+
 list(APPEND SOURCE
     desktop.c
     dragdrop.c

diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt
index 8c82c73..c2b6a24 100644 (file)
--- a/base/system/msiexec/CMakeLists.txt
+++ b/base/system/msiexec/CMakeLists.txt
@@ -5,6 +5,8 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/wine)
 
+set_rc_compiler()
+
 add_executable(msiexec
     msiexec.c
     service.c

diff --git a/base/system/runonce/CMakeLists.txt b/base/system/runonce/CMakeLists.txt
index 314d838..62f7595 100644 (file)
--- a/base/system/runonce/CMakeLists.txt
+++ b/base/system/runonce/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_executable(runonce runonce.c runonce.rc)
 

diff --git a/dll/cpl/access/CMakeLists.txt b/dll/cpl/access/CMakeLists.txt
index e9e8992..b76afa3 100644 (file)
--- a/dll/cpl/access/CMakeLists.txt
+++ b/dll/cpl/access/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(access.cpl access.spec)
 

diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt
index 0d2eb90..f7423cf 100644 (file)
--- a/dll/cpl/appwiz/CMakeLists.txt
+++ b/dll/cpl/appwiz/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(appwiz.cpl appwiz.spec)
 

diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt
index 5db03ec..a9ae5cb 100644 (file)
--- a/dll/cpl/desk/CMakeLists.txt
+++ b/dll/cpl/desk/CMakeLists.txt
@@ -5,6 +5,7 @@ add_definitions(
     -D_WIN32
     -D_DLL -D__USE_CRTIMP)
 
+set_rc_compiler()
 spec2def(desk.cpl desk.spec)
 
 add_library(desk SHARED

diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt
index bfc666e..8082d0c 100644 (file)
--- a/dll/cpl/hdwwiz/CMakeLists.txt
+++ b/dll/cpl/hdwwiz/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(hdwwiz.cpl hdwwiz.spec)
 

diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt
index 19e84ad..de8c3f0 100644 (file)
--- a/dll/cpl/input/CMakeLists.txt
+++ b/dll/cpl/input/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(input.dll input.spec)
 

diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt
index 3a10202..6aaa0d3 100644 (file)
--- a/dll/cpl/intl/CMakeLists.txt
+++ b/dll/cpl/intl/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 

diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt
index 27c98ed..c08cc5b 100644 (file)
--- a/dll/cpl/joy/CMakeLists.txt
+++ b/dll/cpl/joy/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(joy.cpl joy.spec)
 

diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt
index a2c1683..38eb38e 100644 (file)
--- a/dll/cpl/main/CMakeLists.txt
+++ b/dll/cpl/main/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 

diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt
index 85c1ccb..6384bb3 100644 (file)
--- a/dll/cpl/mmsys/CMakeLists.txt
+++ b/dll/cpl/mmsys/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_definitions(-D_DLL -D__USE_CRTIMP)
 

diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt
index d2a5b34..f6ac3d0 100644 (file)
--- a/dll/cpl/powercfg/CMakeLists.txt
+++ b/dll/cpl/powercfg/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(powercfg.cpl powercfg.spec)
 

diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt
index 00030c2..038c94f 100644 (file)
--- a/dll/cpl/sysdm/CMakeLists.txt
+++ b/dll/cpl/sysdm/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(sysdm.cpl sysdm.spec)
 

diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt
index 166c0d8..f321a56 100644 (file)
--- a/dll/cpl/telephon/CMakeLists.txt
+++ b/dll/cpl/telephon/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(telephon.cpl telephon.spec)
 

diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt
index 8c656c5..48eb91e 100644 (file)
--- a/dll/cpl/timedate/CMakeLists.txt
+++ b/dll/cpl/timedate/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(timedate.cpl timedate.spec)
 

diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt
index c71fc65..e1728b5 100644 (file)
--- a/dll/cpl/usrmgr/CMakeLists.txt
+++ b/dll/cpl/usrmgr/CMakeLists.txt
@@ -3,6 +3,8 @@ set_unicode()
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(usrmgr.cpl usrmgr.spec)
 
 add_library(usrmgr SHARED

diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt
index 0ed62d8..dae34eb 100644 (file)
--- a/dll/shellext/deskadp/CMakeLists.txt
+++ b/dll/shellext/deskadp/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set_unicode()
-
+set_rc_compiler()
 spec2def(deskadp.dll deskadp.spec)
 
 list(APPEND SOURCE

diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt
index 098c33d..6b0f655 100644 (file)
--- a/dll/shellext/deskmon/CMakeLists.txt
+++ b/dll/shellext/deskmon/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(deskmon.dll deskmon.spec)
 

diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt
index aa178ee..5b63f59 100644 (file)
--- a/dll/shellext/devcpux/CMakeLists.txt
+++ b/dll/shellext/devcpux/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(devcpux.dll devcpux.spec)
 

diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt
index c3f3d5a..d758354 100644 (file)
--- a/dll/shellext/fontext/CMakeLists.txt
+++ b/dll/shellext/fontext/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set_unicode()
-
+set_rc_compiler()
 spec2def(fontext.dll fontext.spec)
 
 add_library(fontext SHARED

diff --git a/dll/shellext/slayer/CMakeLists.txt b/dll/shellext/slayer/CMakeLists.txt
index dc24cb0..7ef277b 100644 (file)
--- a/dll/shellext/slayer/CMakeLists.txt
+++ b/dll/shellext/slayer/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(slayer.dll slayer.spec)
 

diff --git a/dll/win32/acledit/CMakeLists.txt b/dll/win32/acledit/CMakeLists.txt
index 884f3e4..87d336c 100644 (file)
--- a/dll/win32/acledit/CMakeLists.txt
+++ b/dll/win32/acledit/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set_unicode()
-
+set_rc_compiler()
 spec2def(acledit.dll acledit.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt
index 57e071d..11955dd 100644 (file)
--- a/dll/win32/aclui/CMakeLists.txt
+++ b/dll/win32/aclui/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 spec2def(aclui.dll aclui.spec)
-
+set_rc_compiler()
 set_unicode()
 
 add_definitions(-DSUPPORT_UXTHEME)

diff --git a/dll/win32/avifil32/CMakeLists.txt b/dll/win32/avifil32/CMakeLists.txt
index c11db8b..ef6182a 100644 (file)
--- a/dll/win32/avifil32/CMakeLists.txt
+++ b/dll/win32/avifil32/CMakeLists.txt
@@ -8,6 +8,8 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(avifil32.dll avifil32.spec)
 
 add_library(avifil32 SHARED

diff --git a/dll/win32/batt/CMakeLists.txt b/dll/win32/batt/CMakeLists.txt
index eef5afd..d696505 100644 (file)
--- a/dll/win32/batt/CMakeLists.txt
+++ b/dll/win32/batt/CMakeLists.txt
@@ -2,6 +2,7 @@
 spec2def(batt.dll batt.spec)
 
 set_unicode()
+set_rc_compiler()
 
 add_library(batt SHARED
     batt.c

diff --git a/dll/win32/cards/CMakeLists.txt b/dll/win32/cards/CMakeLists.txt
index ac82cd0..ff0bd90 100644 (file)
--- a/dll/win32/cards/CMakeLists.txt
+++ b/dll/win32/cards/CMakeLists.txt
@@ -4,6 +4,8 @@ set_unicode()
 # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN
 add_definitions(-DCARDSTYLE_DEFAULT)
 
+set_rc_compiler()
+
 spec2def(cards.dll cards.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt
index 4413cdb..e45cc97 100644 (file)
--- a/dll/win32/comctl32/CMakeLists.txt
+++ b/dll/win32/comctl32/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 add_definitions(
     -D__WINESRC__

diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt
index 29a8bad..6feb5bf 100644 (file)
--- a/dll/win32/devmgr/CMakeLists.txt
+++ b/dll/win32/devmgr/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(devmgr.dll devmgr.spec)
 

diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt
index 7bca0bb..7c1d697 100644 (file)
--- a/dll/win32/hhctrl.ocx/CMakeLists.txt
+++ b/dll/win32/hhctrl.ocx/CMakeLists.txt
@@ -6,6 +6,7 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
 spec2def(hhctrl.ocx hhctrl.ocx.spec)
 
 add_library(hhctrl SHARED

diff --git a/dll/win32/iccvid/CMakeLists.txt b/dll/win32/iccvid/CMakeLists.txt
index ba86b3f..f8f73e5 100644 (file)
--- a/dll/win32/iccvid/CMakeLists.txt
+++ b/dll/win32/iccvid/CMakeLists.txt
@@ -3,6 +3,8 @@ add_definitions(-D__WINESRC__)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(iccvid.dll iccvid.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt
index fcef98e..b4e56d0 100644 (file)
--- a/dll/win32/jscript/CMakeLists.txt
+++ b/dll/win32/jscript/CMakeLists.txt
@@ -15,6 +15,8 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(jscript.dll jscript.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt
index 63aed04..5b7e7cc 100644 (file)
--- a/dll/win32/kernel32/CMakeLists.txt
+++ b/dll/win32/kernel32/CMakeLists.txt
@@ -6,6 +6,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)
 
 list(APPEND SOURCE

diff --git a/dll/win32/localui/CMakeLists.txt b/dll/win32/localui/CMakeLists.txt
index 6bc0d4b..f1e179b 100644 (file)
--- a/dll/win32/localui/CMakeLists.txt
+++ b/dll/win32/localui/CMakeLists.txt
@@ -2,6 +2,8 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(localui.dll localui.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/modemui/CMakeLists.txt b/dll/win32/modemui/CMakeLists.txt
index a78781b..50c536b 100644 (file)
--- a/dll/win32/modemui/CMakeLists.txt
+++ b/dll/win32/modemui/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 set_unicode()
+set_rc_compiler()
 
 spec2def(modemui.dll modemui.spec)
 

diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt
index 94cad13..34964e7 100644 (file)
--- a/dll/win32/msi/CMakeLists.txt
+++ b/dll/win32/msi/CMakeLists.txt
@@ -5,6 +5,7 @@ add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T)
 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)

diff --git a/dll/win32/msrle32/CMakeLists.txt b/dll/win32/msrle32/CMakeLists.txt
index 603975e..6f8faa8 100644 (file)
--- a/dll/win32/msrle32/CMakeLists.txt
+++ b/dll/win32/msrle32/CMakeLists.txt
@@ -5,6 +5,8 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(msrle32.dll msrle32.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/mstask/CMakeLists.txt b/dll/win32/mstask/CMakeLists.txt
index 935f642..58a350b 100644 (file)
--- a/dll/win32/mstask/CMakeLists.txt
+++ b/dll/win32/mstask/CMakeLists.txt
@@ -9,6 +9,8 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 generate_idl_iids(mstask_local.idl)
 
 spec2def(mstask.dll mstask.spec)

diff --git a/dll/win32/netid/CMakeLists.txt b/dll/win32/netid/CMakeLists.txt
index 44afe7f..4e17334 100644 (file)
--- a/dll/win32/netid/CMakeLists.txt
+++ b/dll/win32/netid/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 spec2def(netid.dll netid.spec)
+set_rc_compiler()
 
 list(APPEND SOURCE
     netid.c

diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt
index f184a79..f0163bd 100644 (file)
--- a/dll/win32/ole32/CMakeLists.txt
+++ b/dll/win32/ole32/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+set_rc_compiler()
+
 spec2def(ole32.dll ole32.spec)
 generate_idl_iids(dcom.idl)
 add_idl_headers(ole32idl dcom.idl irot.idl)

diff --git a/dll/win32/qmgr/CMakeLists.txt b/dll/win32/qmgr/CMakeLists.txt
index 1d00c96..15d4ad7 100644 (file)
--- a/dll/win32/qmgr/CMakeLists.txt
+++ b/dll/win32/qmgr/CMakeLists.txt
@@ -2,6 +2,8 @@
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 generate_idl_iids(qmgr_local.idl)
 
 spec2def(qmgr.dll qmgr.spec)

diff --git a/dll/win32/rasdlg/CMakeLists.txt b/dll/win32/rasdlg/CMakeLists.txt
index 2b25dc5..de31096 100644 (file)
--- a/dll/win32/rasdlg/CMakeLists.txt
+++ b/dll/win32/rasdlg/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+set_rc_compiler()
 spec2def(rasdlg.dll rasdlg.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/riched20/CMakeLists.txt b/dll/win32/riched20/CMakeLists.txt
index 2d107ab..1f00e63 100644 (file)
--- a/dll/win32/riched20/CMakeLists.txt
+++ b/dll/win32/riched20/CMakeLists.txt
@@ -6,6 +6,7 @@ add_definitions(
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(riched20.dll riched20.spec)
+set_rc_compiler()
 
 list(APPEND SOURCE
     caret.c

diff --git a/dll/win32/serialui/CMakeLists.txt b/dll/win32/serialui/CMakeLists.txt
index 4f4304f..5ac1ed5 100644 (file)
--- a/dll/win32/serialui/CMakeLists.txt
+++ b/dll/win32/serialui/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set_unicode()
-
+set_rc_compiler()
 spec2def(serialui.dll serialui.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/shdoclc/CMakeLists.txt b/dll/win32/shdoclc/CMakeLists.txt
index 18e5caa..fd168a8 100644 (file)
--- a/dll/win32/shdoclc/CMakeLists.txt
+++ b/dll/win32/shdoclc/CMakeLists.txt
@@ -1,8 +1,11 @@
 
 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)
 

diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt
index f03abb9..125c4a5 100644 (file)
--- a/dll/win32/shdocvw/CMakeLists.txt
+++ b/dll/win32/shdocvw/CMakeLists.txt
@@ -5,6 +5,8 @@ add_dependencies(shdocvw_v1 stdole2)
 add_definitions(-D_SHDOCVW_)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(shdocvw.dll shdocvw.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt
index 7ffc1e1..2976ddd 100644 (file)
--- a/dll/win32/shimgvw/CMakeLists.txt
+++ b/dll/win32/shimgvw/CMakeLists.txt
@@ -1,4 +1,5 @@
 
+set_rc_compiler()
 spec2def(shimgvw.dll shimgvw.spec)
 
 list(APPEND SOURCE

diff --git a/dll/win32/shlwapi/shlwapi_Hu.rc b/dll/win32/shlwapi/shlwapi_Hu.rc
index c8ffa5a..94ce85e 100644 (file)
--- a/dll/win32/shlwapi/shlwapi_Hu.rc
+++ b/dll/win32/shlwapi/shlwapi_Hu.rc
@@ -32,17 +32,17 @@ FONT 8, "MS Shell Dlg"
 {
  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"
 }

diff --git a/dll/win32/shlwapi/shlwapi_Pt.rc b/dll/win32/shlwapi/shlwapi_Pt.rc
index 6014fcc..bd07373 100644 (file)
--- a/dll/win32/shlwapi/shlwapi_Pt.rc
+++ b/dll/win32/shlwapi/shlwapi_Pt.rc
@@ -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 @@ FONT 8, "MS Shell Dlg"
 {
  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

diff --git a/dll/win32/tapiui/CMakeLists.txt b/dll/win32/tapiui/CMakeLists.txt
index 18b745e..0ffb21c 100644 (file)
--- a/dll/win32/tapiui/CMakeLists.txt
+++ b/dll/win32/tapiui/CMakeLists.txt
@@ -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)

diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt
index 1126af7..bb50265 100644 (file)
--- a/dll/win32/urlmon/CMakeLists.txt
+++ b/dll/win32/urlmon/CMakeLists.txt
@@ -6,6 +6,8 @@ add_definitions(-D_WIN32_WINNT=0x600)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
+set_rc_compiler()
+
 spec2def(urlmon.dll urlmon.spec)
 
 add_rpcproxy_library(urlmonproxy urlmon_urlmon.idl)

diff --git a/dll/win32/userenv/CMakeLists.txt b/dll/win32/userenv/CMakeLists.txt
index e638caf..513c911 100644 (file)
--- a/dll/win32/userenv/CMakeLists.txt
+++ b/dll/win32/userenv/CMakeLists.txt
@@ -1,6 +1,8 @@
 
 spec2def(userenv.dll userenv.spec)
 
+set_rc_compiler()
+
 list(APPEND SOURCE
     desktop.c
     directory.c

diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt
index 90b866a..aaaeaac 100644 (file)
--- a/drivers/storage/ide/uniata/CMakeLists.txt
+++ b/drivers/storage/ide/uniata/CMakeLists.txt
@@ -2,6 +2,7 @@
 include_directories(inc)
 
 set_cpp()
+set_rc_compiler()
 
 add_library(uniata SHARED
     id_ata.cpp

diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt
index a3199e2..73bd52e 100644 (file)
--- a/drivers/storage/port/buslogic/CMakeLists.txt
+++ b/drivers/storage/port/buslogic/CMakeLists.txt
@@ -1,4 +1,6 @@
 
+set_rc_compiler()
+
 add_library(buslogic SHARED BusLogic958.c BusLogic958.rc)
 
 target_link_libraries(buslogic libcntpr)

diff --git a/gcc.cmake b/gcc.cmake
index 9142772..2c1e237 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -10,7 +10,14 @@ set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-bas
 # -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 @@ macro(set_module_type MODULE TYPE)
         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 @@ macro(set_rc_compiler)
         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