- 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

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"

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"

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"

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"

View file

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

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"

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"

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"

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"

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"

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"

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"

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"