[CMAKE]
authorAmine Khaldi <amine.khaldi@reactos.org>
Thu, 30 Dec 2010 15:39:10 +0000 (15:39 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Thu, 30 Dec 2010 15:39:10 +0000 (15:39 +0000)
- 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.

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

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

index 2720623..fd4c043 100644 (file)
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 project(REACTOS)
 
 if(NOT ARCH)
index 945df68..8b0d15e 100644 (file)
@@ -52,7 +52,7 @@ IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"
 #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"
index eef95d5..4fde55c 100644 (file)
@@ -10,7 +10,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #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"
index 3ca9862..1bab332 100644 (file)
@@ -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"
index 83a50d1..b4cec35 100644 (file)
@@ -20,7 +20,7 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 #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 @@ IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 #include "lang/sk-SK.rc"
 #include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"
+
index 5ed5016..40a9b97 100644 (file)
@@ -60,3 +60,4 @@
 #define IDS_COLUMNUSER                  306
 #define IDS_COLUMNCOMPUTER              307
 #define IDS_COLUMNEVENTDATA             308
+
index 0563d91..b109367 100644 (file)
@@ -16,10 +16,10 @@ IDI_ERRORICON           ICON  "res/error.ico"
 #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"
index 1b03b7b..63b5dfb 100644 (file)
@@ -28,7 +28,7 @@ IDI_DRIVER      ICON "res/driver.ico"
 #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"
index 6824180..6d1bedc 100644 (file)
@@ -20,7 +20,7 @@ IDB_SPECT   BITMAP "res/spectrum.bmp"
 #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"
index d33e548..535a52c 100644 (file)
@@ -48,7 +48,7 @@ IDI_NPICON ICON "res/notepad.ico"
 #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"
index 75db8c8..10c7037 100644 (file)
@@ -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"
index c09097f..b9a6bb3 100644 (file)
@@ -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"
index ae770b5..79db6af 100644 (file)
@@ -38,7 +38,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #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"
index e7ccf62..14464dc 100644 (file)
@@ -20,7 +20,7 @@ IDB_SERVER    BITMAP DISCARDABLE      "res/1.bmp"
 #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"
index efbb68a..db03960 100644 (file)
@@ -23,7 +23,7 @@ IDB_HEADER    BITMAP "resources/header.bmp"
 #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"
index a05f295..89d1c12 100644 (file)
@@ -51,7 +51,7 @@ END
 #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"
index a0215de..fdfc56d 100644 (file)
@@ -15,7 +15,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #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"
index c27b561..54e3dd1 100644 (file)
@@ -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"
index f9e7669..c3af70a 100644 (file)
@@ -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"
index ee3e6ff..a5f97a8 100644 (file)
@@ -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"
index 392035a..4df4ad6 100644 (file)
@@ -30,17 +30,17 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 //
 // 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"
 
 
 /*
index 0d8989e..5bcd0e1 100644 (file)
@@ -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"
index 47f67ab..d094866 100644 (file)
@@ -33,7 +33,7 @@ IDI_NET_TRANSREC            ICON "res/nettrrec.ico"
 #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"
index 1a93be1..825f7e1 100644 (file)
@@ -60,7 +60,7 @@ END
 #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"
index d13f09b..bf10ebe 100644 (file)
@@ -63,7 +63,7 @@ IDR_GPL RT_TEXT "COPYING"
 #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"
index 5a26ab8..e94c3ec 100644 (file)
@@ -13,7 +13,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #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"