[akhaldi] 50224: [CMAKE] - Disable some resource files (mostly japanese ones) with a FIXME. They prevent us from compiling in unix due to an iconv issue. - Lower the minimum required cmake version ...

Author: akhaldi
Date: Thu Dec 30 15:39:10 2010
New Revision: 50224

URL: http://svn.reactos.org/svn/reactos?rev=50224&view=rev
Log:
[CMAKE]
- Disable some resource files (mostly japanese ones) with a FIXME. They prevent us from
compiling in unix due to an iconv issue.
- Lower the minimum required cmake version to 2.6
- Fix browseui resource paths.

Modified:
    branches/cmake-bringup/CMakeLists.txt
    branches/cmake-bringup/base/applications/calc/resource.rc
    branches/cmake-bringup/base/applications/dxdiag/rsrc.rc
    branches/cmake-bringup/base/applications/mplay32/rsrc.rc
    branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc
    branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h
    branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc
    branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc
    branches/cmake-bringup/base/applications/mstsc/rsrc.rc
    branches/cmake-bringup/base/applications/notepad/rsrc.rc
    branches/cmake-bringup/base/applications/paint/rsrc.rc
    branches/cmake-bringup/base/applications/rapps/rsrc.rc
    branches/cmake-bringup/base/applications/regedit/rsrc.rc
    branches/cmake-bringup/base/applications/screensavers/logon/logon.rc
    branches/cmake-bringup/base/setup/vmwinst/rsrc.rc
    branches/cmake-bringup/base/setup/welcome/rsrc.rc
    branches/cmake-bringup/base/system/winlogon/rsrc.rc
    branches/cmake-bringup/dll/cpl/desk/rsrc.rc
    branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc
    branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc
    branches/cmake-bringup/dll/win32/browseui/browseui.rc
    branches/cmake-bringup/dll/win32/netid/rsrc.rc
    branches/cmake-bringup/dll/win32/netshell/netshell.rc
    branches/cmake-bringup/dll/win32/shell32/shell32.rc
    branches/cmake-bringup/dll/win32/syssetup/syssetup.rc
    branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc

Modified: branches/cmake-bringup/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re…
==============================================================================
--- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Thu Dec 30 15:39:10 2010
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 project(REACTOS)
 
 if(NOT ARCH)

Modified: branches/cmake-bringup/base/applications/calc/resource.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -52,7 +52,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/dxdiag/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -10,7 +10,7 @@
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/mplay32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -8,7 +8,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+// #include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Thu Dec
30 15:39:10 2010
@@ -20,7 +20,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
@@ -29,3 +29,4 @@
 #include "lang/sk-SK.rc"
 #include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"
+

Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Thu
Dec 30 15:39:10 2010
@@ -60,3 +60,4 @@
 #define IDS_COLUMNUSER                  306
 #define IDS_COLUMNCOMPUTER              307
 #define IDS_COLUMNEVENTDATA             308
+

Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Thu
Dec 30 15:39:10 2010
@@ -16,10 +16,10 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
-#include "lang/pl-PL.rc"
+//#include "lang/pl-PL.rc" FIXME: iconv issue
 #include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

Modified: branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Thu Dec
30 15:39:10 2010
@@ -28,7 +28,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/applications/mstsc/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -20,7 +20,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/notepad/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -48,7 +48,7 @@
 #include "lang/hy-AM.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/paint/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/paint/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/paint/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -21,7 +21,7 @@
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -3,7 +3,7 @@
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"

Modified: branches/cmake-bringup/base/applications/regedit/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -38,7 +38,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" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/screensavers/logon/logon.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1] Thu
Dec 30 15:39:10 2010
@@ -20,7 +20,7 @@
 #include "lang/es-ES.rc"
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"

Modified: branches/cmake-bringup/base/setup/vmwinst/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins…
==============================================================================
--- branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -23,7 +23,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" FIXME: iconv issue
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/setup/welcome/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom…
==============================================================================
--- branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -51,7 +51,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" FIXME: iconv issue
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

Modified: branches/cmake-bringup/base/system/winlogon/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo…
==============================================================================
--- branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -15,7 +15,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" FIXME: iconv issue
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

Modified: branches/cmake-bringup/dll/cpl/desk/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/rsrc…
==============================================================================
--- branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010
@@ -11,7 +11,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" FIXME: iconv issue
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/…
==============================================================================
--- branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010
@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/rsr…
==============================================================================
--- branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010
@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ro-RO.rc"

Modified: branches/cmake-bringup/dll/win32/browseui/browseui.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu…
==============================================================================
--- branches/cmake-bringup/dll/win32/browseui/browseui.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/browseui/browseui.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -30,17 +30,17 @@
 //
 // REGISTRY
 //
-IDR_ADDRESSBAND          REGISTRY                "res\\addressband.rgs"
-IDR_ADDRESSEDITBOX       REGISTRY                "res\\addresseditbox.rgs"
-IDR_ACLMULTI             REGISTRY               
"res\\autocompletecontainer.rgs"
-IDR_BANDPROXY            REGISTRY                "res\\bandproxy.rgs"
-IDR_BANDSITE             REGISTRY                "res\\rebarbandsite.rgs"
-IDR_BANDSITEMENU         REGISTRY                "res\\bandsitemenu.rgs"
-IDR_BRANDBAND            REGISTRY                "res\\brandband.rgs"
-IDR_COMMONBROWSER        REGISTRY                "res\\commonbrowser.rgs"
-IDR_GLOBALFOLDERSETTINGS REGISTRY               
"res\\globalfoldersettings.rgs"
-IDR_INTERNETTOOLBAR      REGISTRY                "res\\internettoolbar.rgs"
-IDR_REGTREEOPTIONS       REGISTRY                "res\\regtreeoptions.rgs"
+IDR_ADDRESSBAND          REGISTRY                "res/addressband.rgs"
+IDR_ADDRESSEDITBOX       REGISTRY                "res/addresseditbox.rgs"
+IDR_ACLMULTI             REGISTRY               
"res/autocompletecontainer.rgs"
+IDR_BANDPROXY            REGISTRY                "res/bandproxy.rgs"
+IDR_BANDSITE             REGISTRY                "res/rebarbandsite.rgs"
+IDR_BANDSITEMENU         REGISTRY                "res/bandsitemenu.rgs"
+IDR_BRANDBAND            REGISTRY                "res/brandband.rgs"
+IDR_COMMONBROWSER        REGISTRY                "res/commonbrowser.rgs"
+IDR_GLOBALFOLDERSETTINGS REGISTRY               
"res/globalfoldersettings.rgs"
+IDR_INTERNETTOOLBAR      REGISTRY                "res/internettoolbar.rgs"
+IDR_REGTREEOPTIONS       REGISTRY                "res/regtreeoptions.rgs"
 
 
 /*

Modified: branches/cmake-bringup/dll/win32/netid/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/r…
==============================================================================
--- branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] Thu Dec 30 15:39:10 2010
@@ -9,7 +9,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/it-IT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/dll/win32/netshell/netshell.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netshel…
==============================================================================
--- branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -33,7 +33,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" FIXME: iconv issue
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/dll/win32/shell32/shell32.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32…
==============================================================================
--- branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -60,7 +60,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/dll/win32/syssetup/syssetup.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu…
==============================================================================
--- branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] Thu Dec 30 15:39:10
2010
@@ -63,7 +63,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" FIXME: iconv issue
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…
==============================================================================
--- branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Thu Dec 30
15:39:10 2010
@@ -13,7 +13,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
+//#include "lang/ja-JP.rc" FIXME: iconv issue
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"