Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-19 09:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
- 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
This commit is contained in:
Amine Khaldi 2010-12-30 15:39:10 +00:00
parent 5351f44808
commit fce639e14b
26 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 2.6)
project(REACTOS)
if(NOT ARCH)

2
base/applications/calc/resource.rc
View 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"

2
base/applications/dxdiag/rsrc.rc
View 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"

2
base/applications/mplay32/rsrc.rc
View 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"

3
base/applications/mscutils/devmgmt/rsrc.rc
View 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"

1
base/applications/mscutils/eventvwr/resource.h
View file

@ -60,3 +60,4 @@
#define IDS_COLUMNUSER 306
#define IDS_COLUMNCOMPUTER 307
#define IDS_COLUMNEVENTDATA 308

4
base/applications/mscutils/eventvwr/rsrc.rc
View 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"

2
base/applications/mscutils/servman/rsrc.rc
View 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"

2
base/applications/mstsc/rsrc.rc
View 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"

2
base/applications/notepad/rsrc.rc
View 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"

2
base/applications/paint/rsrc.rc
View 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"

2
base/applications/rapps/rsrc.rc
View 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"

2
base/applications/regedit/rsrc.rc
View 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"

2
base/applications/screensavers/logon/logon.rc
View 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"

2
base/setup/vmwinst/rsrc.rc
View 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"

2
base/setup/welcome/rsrc.rc
View 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"

2
base/system/winlogon/rsrc.rc
View 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"

2
dll/cpl/desk/rsrc.rc
View 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"

2
dll/cpl/powercfg/rsrc.rc
View 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"

2
dll/cpl/sysdm/rsrc.rc
View 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"

22
dll/win32/browseui/browseui.rc
View 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"
/*

2
dll/win32/netid/rsrc.rc
View 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"

2
dll/win32/netshell/netshell.rc
View 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"

2
dll/win32/shell32/shell32.rc
View 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"

2
dll/win32/syssetup/syssetup.rc
View 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"

2
subsystems/win32/csrss/win32csr/rsrc.rc
View 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"