[ros-diffs] [dreimer] 44454: Finally merge the 64 bit and 32 bit options tool and remove the 64 bit one.

Author: dreimer
Date: Mon Dec  7 14:16:46 2009
New Revision: 44454

URL: http://svn.reactos.org/svn/reactos?rev=44454&view=rev
Log:
Finally merge the 64 bit and 32 bit options tool and remove the 64 bit one.

Removed:
    trunk/tools/RosBE/RosBE-Windows/Tools/config/amd64/
Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
    trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h
    trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -9,11 +9,14 @@
 $host.ui.RawUI.WindowTitle = "Options"

+
 if ("$ENV:ROS_ARCH" -eq "amd64") {
-    $options="$_ROSBE_BASEDIR\Tools\options64.exe"
+    $options="$_ROSBE_BASEDIR\Tools\options.exe"
+    $param = "amd64"
     $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.ps1"
 } else {
     $options="$_ROSBE_BASEDIR\Tools\options.exe"
+    $param = $null
     $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.ps1"
 }

@@ -21,7 +24,7 @@

if (Test-Path "$options") {
     Push-Location "$_ROSBE_BASEDIR"
-    & "$options" | out-null
+    &{IEX "& '$options' $param"} | out-null
     Pop-Location
     if (Test-Path "$cfgfile") {
         & "$cfgfile"

Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opti...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -15,17 +15,19 @@
 title Options

if "%ROS_ARCH%" == "amd64" (
-    set options=%_ROSBE_BASEDIR%\Tools\options64.exe
+    set options=%_ROSBE_BASEDIR%\Tools\options.exe
+    set param=amd64
     set cfgfile=%APPDATA%\RosBE\rosbe-options-amd64.cmd
 ) else (
     set options=%_ROSBE_BASEDIR%\Tools\options.exe
+    set param=
     set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd
 )

:: Run options.exe
 if exist "%options%" (
     pushd "%_ROSBE_BASEDIR%"
-    call "%options%"
+    call "%options%" %param%
     popd

if exist "%cfgfile%" (

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.n...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -124,27 +124,11 @@
             CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
         IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
             CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico"
+        IfFileExists "$INSTDIR\Tools\options.exe" 0 +2
+            CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options 64-bit.lnk" "$INSTDIR\Tools\options.exe" "amd64"
         SetOutPath $INSTDIR
         CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \
                        "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe"
-    !insertmacro MUI_STARTMENU_WRITE_END
-SectionEnd
-
-Section /o "Config Tool" SEC03
-    SetShellVarContext current
-    SetOutPath "$INSTDIR"
-    SetOverwrite try
-    File /r Root\options.cmd
-    IfFileExists "$INSTDIR\RosBE.ps1" 0 +3
-        File /r Components\Powershell\options.ps1
-    SetOutPath "$INSTDIR\Tools"
-    SetOverwrite try
-    File /r Components\Tools\options64.exe
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        CreateDirectory "$SMPROGRAMS$ICONS_GROUP"
-        SetOutPath $INSTDIR
-        CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options 64-bit.lnk" \
-                       "$INSTDIR\Tools\options64.exe"
     !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd

@@ -203,8 +187,6 @@
     ;; Clean up installed files.
     ;;
     RMDir /r /REBOOTOK "$INSTDIR\amd64"
-    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe"
-    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe"
     Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
     ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!!
     RMDir /REBOOTOK "$INSTDIR"

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/de-DE.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -3,6 +3,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "RosBE Einstellungen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12
+  LTEXT "Schriftfarbe", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nBeispieltext", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Nostrip Dateien zum Debuggen erzeugen", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Versions Header anzeigen", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "RosBE AMD64 Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Hintergrundfarbe", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/en-US.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -3,6 +3,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS Build Environment Settings"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Background Color", -1, 10, 10, 75, 12
+  LTEXT "Font Color", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nSample text", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS AMD64 Build Environment Settings"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Background Color", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/es-ES.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -3,6 +3,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Configuración de ReactOS Build Environment"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Color de fondo", -1, 10, 10, 75, 12
+  LTEXT "Color de fuente", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nTexto ejemplo", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "Mostrar tiempo de creación", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "Usar CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Limpiar salida", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Cree archivos no limpios para depuración", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Ruta de MinGW/GCC", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Guardar Logs (Registros)", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Cambiar carpeta parar OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Cambiar carpeta para OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Guardar", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Cancelar", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "¡Bienvenido!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Configuración de ReactOS AMD64 Build Environment"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Color de fondo", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/fr-FR.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -3,6 +3,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Paramètres de l'Environnement de Compilation de ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12
+  LTEXT "Couleur de la police", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nTexte d'exemple", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 125, 50, 120, 36
+  CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 110, 12
+  CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Paramètres de AMD64 l'Environnement de Compilation de ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Couleur d'arrière plan", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/pl-PL.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -3,6 +3,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ustawienia ReactOS Build Environment"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Kolor t³a", -1, 10, 10, 75, 12
+  LTEXT "Kolor czcionki", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nPrzyk³adowy tekst", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "Poka¿ czas budowania", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "U¿yj CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Usuñ dane debugowania", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Utwórz pliki nostrip dla debugowania", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Œcie¿ka do MinGW/GCC", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Zapisuj logi", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Zmieñ folder plików OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Zmieñ folder plików OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Zapisz", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Anuluj", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Ustawienia ReactOS AMD64 Build Environment"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Kolor t³a", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/ru-RU.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -5,6 +5,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS"
+FONT 8,"MS Sans Serif",0,0
+BEGIN
+  LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12
+  LTEXT "Öâåò øðèôòà", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nÏðèìåð òåêñòà", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "Îòîáðàæàòü âðåìÿ êîìïèëÿöèè", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Îñòàâëÿòü â ôàéëàõ èíôîðìàöèþ äëÿ âîçìîæíîñòè ðàáîòû äåáàãåðà", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ReactOS - AMD64"
 FONT 8,"MS Sans Serif",0,0
 BEGIN
   LTEXT "Öâåò ôîíà", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/uk-UA.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -11,6 +11,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12
+  LTEXT "Êîë³ð øðèôòó", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\nÇðàçîê òåêñòó", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "³äîáðàæàòè ÷àñ êîìï³ëÿö³¿", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Show Versions Header", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS - AMD64"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "Êîë³ð ôîíó", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/lang/zh-TW.rc [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -11,6 +11,38 @@
 ID_DIALOG DIALOGEX DISCARDABLE  0, 0, 255, 290
 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m"
+FONT 8, "MS Shell Dlg"
+BEGIN
+  LTEXT "­I´ºÃC¦â", -1, 10, 10, 75, 12
+  LTEXT "¦rÅéÃC¦â", 0x0, 10, 27, 75, 12
+  COMBOBOX IDC_BACK, 135, 10, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  COMBOBOX IDC_FONT, 135, 25, 100, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST
+  CONTROL "\n\n¥Ü¨Ò¤å¥»", ID_EXAMPLE, "static", WS_CHILD | WS_VISIBLE | WS_TABSTOP | SS_CENTER, 113, 50, 125, 36
+  CONTROL "Åã¥Ü«Ø¸m®É¶¡", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 45, 100, 12
+  CONTROL "¨Ï¥Î CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12
+  CONTROL "µô´î¿é¥X", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12
+  CONTROL "«Ø¥ß½Õ¸Õ¥Îªº¥]¸ËÀÉ", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 145, 12
+  CONTROL "Åã¥Üª©¥»¼ÐÀY", ID_SHOWVERSION, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 155, 90, 100, 12
+  LTEXT "MinGW/GCC ªº¸ô®|", -1, 10, 107, 100, 15
+  EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP
+  PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP
+  CONTROL "Àx¦s¤é»x", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12
+  EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "§ó§ï OBJ ªº¥Ø¿ý", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12
+  EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED
+  CONTROL "§ó§ï OUT ªº¥Ø¿ý", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12
+  EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "Àx¦s", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED
+  PUSHBUTTON "¨ú®ø", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP
+  CONTROL "Åwªï¡I", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15
+END
+
+ID_DIALOG64 DIALOGEX DISCARDABLE  0, 0, 255, 290
+STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ReactOS «Ø¸mÀô¹Ò³]¸m - AMD64"
 FONT 8, "MS Shell Dlg"
 BEGIN
   LTEXT "­I´ºÃC¦â", -1, 10, 10, 75, 12

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -45,12 +45,21 @@
     static WCHAR filename[MAX_PATH];
     if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE))
     {
-        if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options.cmd")) < MAX_PATH)
-            wcscat(filename, L"\RosBE\rosbe-options.cmd");
+        if (amd64) {
+            if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options-amd64.cmd")) < MAX_PATH)
+                wcscat(filename, L"\RosBE\rosbe-options-amd64.cmd");
+        } else {
+            if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options.cmd")) < MAX_PATH)
+                wcscat(filename, L"\RosBE\rosbe-options.cmd");
+        }
     }
     else
     {
-        wcscpy(filename, L"rosbe-options.cmd");
+        if (amd64) {
+            wcscpy(filename, L"rosbe-options-amd64.cmd");
+        } else {
+            wcscpy(filename, L"rosbe-options.cmd");
+        }
     }
     return filename;
 }
@@ -63,12 +72,21 @@
     static WCHAR filename[MAX_PATH];
     if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE))
     {
-        if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options.ps1")) < MAX_PATH)
-            wcscat(filename, L"\RosBE\rosbe-options.ps1");
+        if (amd64) {
+            if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options-amd64.ps1")) < MAX_PATH)
+                wcscat(filename, L"\RosBE\rosbe-options-amd64.ps1");
+        } else {
+            if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options.ps1")) < MAX_PATH)
+                wcscat(filename, L"\RosBE\rosbe-options.ps1");
+        }
     }
     else
     {
-        wcscpy(filename, L"rosbe-options.ps1");
+        if (amd64) {
+            wcscpy(filename, L"rosbe-options-amd64.ps1");
+        } else {
+            wcscpy(filename, L"rosbe-options.ps1");
+        }
     }
     return filename;
 }
@@ -111,8 +129,13 @@
             return FALSE;

wcscpy(checkmgw, mingwpath);
-    if ((wcslen(checkmgw) + wcslen(L"\bin\gcc.exe")) < MAX_PATH)
-        wcscat(checkmgw, L"\bin\gcc.exe");
+    if (amd64) {
+        if ((wcslen(checkmgw) + wcslen(L"\bin\x86_64-w64-mingw32-gcc.exe")) < MAX_PATH)
+            wcscat(checkmgw, L"\bin\x86_64-w64-mingw32-gcc.exe");
+    } else {
+        if ((wcslen(checkmgw) + wcslen(L"\bin\gcc.exe")) < MAX_PATH)
+            wcscat(checkmgw, L"\bin\gcc.exe");
+    }
     hFile = CreateFile(checkmgw, 0, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
     if (hFile == INVALID_HANDLE_VALUE)
     {
@@ -147,9 +170,13 @@
         fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog);
         fwprintf(pFilecmd, L"set _ROSBE_SHOWVERSION=%d\n", showversion);
         if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir);
-        if (mingwpath[0] != 0) {
-            fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath);
-            fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath);
+        if (amd64) {
+            if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath);
+        } else {
+            if (mingwpath[0] != 0) {
+                fwprintf(pFilecmd, L"set _ROSBE_HOST_MINGWPATH=%s\n", mingwpath);
+                fwprintf(pFilecmd, L"set _ROSBE_TARGET_MINGWPATH=%s\n", mingwpath);
+            }
         }
         if ((objdir[0] != 0) && objstate) {
             fwprintf(pFilecmd, L"set ROS_INTERMEDIATE=%s\n", objdir);
@@ -182,9 +209,13 @@
         fwprintf(pFileps1, L"$global:_ROSBE_WRITELOG = %d\n", writelog);
         fwprintf(pFileps1, L"$global:_ROSBE_SHOWVERSION = %d\n", showversion);
         if (logdir[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_LOGDIR = "%s"\n", logdir);
-        if (mingwpath[0] != 0) {
-            fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = "%s"\n", mingwpath);
-            fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = "%s"\n", mingwpath);
+        if (amd64) {
+            if (mingwpath[0] != 0) fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = "%s"\n", mingwpath);
+        } else {
+            if (mingwpath[0] != 0) {
+                fwprintf(pFileps1, L"$global:_ROSBE_HOST_MINGWPATH = "%s"\n", mingwpath);
+                fwprintf(pFileps1, L"$global:_ROSBE_TARGET_MINGWPATH = "%s"\n", mingwpath);
+            }
         }
         if ((objdir[0] != 0) && objstate) {
             fwprintf(pFileps1, L"$ENV:ROS_INTERMEDIATE = "%s"\n", objdir);
@@ -259,7 +290,9 @@
                     LoadedSettings->showversion = wcstol(ptr2, NULL, 2);
                 else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0)
                     wcsncpy(LoadedSettings->logdir, ptr2, wcslen(ptr2)-1);
-                else if (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0)
+                else if ((amd64) && (wcscmp(ptr, L"_ROSBE_TARGET_MINGWPATH") == 0))
+                    wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1);
+                else if ((!amd64) && (wcscmp(ptr, L"_ROSBE_HOST_MINGWPATH") == 0))
                     wcsncpy(LoadedSettings->mingwpath, ptr2, wcslen(ptr2)-1);
                 else if (wcscmp(ptr, L"ROS_INTERMEDIATE") == 0)
                     wcsncpy(LoadedSettings->objdir, ptr2, wcslen(ptr2)-1);
@@ -273,14 +306,23 @@
     }
     else
     {
-        LoadedSettings->foreground = 0xa;
+        if (amd64) {
+            LoadedSettings->foreground = 0xb;
+        } else {
+            LoadedSettings->foreground = 0xa;
+        }
         LoadedSettings->background = 0;
         LoadedSettings->showtime = 1;
         LoadedSettings->writelog = 1;
         LoadedSettings->showversion = 0;
         GetCurrentDirectory(MAX_PATH, LoadedSettings->mingwpath);
-        if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH)
-            wcscat(LoadedSettings->mingwpath, MINGWVERSION);
+        if (amd64) {
+            if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION64)) < MAX_PATH)
+                wcscat(LoadedSettings->mingwpath, MINGWVERSION64);
+        } else {
+            if ((wcslen(LoadedSettings->mingwpath) + wcslen(MINGWVERSION)) < MAX_PATH)
+                wcscat(LoadedSettings->mingwpath, MINGWVERSION);
+        }

LoadString(hInstance, HLP_DEFAULTMSG, SBTitle, 256);
         SetDlgItemText(infoPtr->hwndDlg, ID_STATUSBAR, SBTitle);
@@ -689,10 +731,18 @@
     POPTIONS_DLG OptionsDlgInfo;
     hInstance = hInst;

+    if (strcmp(cmdline,"amd64") == 0)
+    {
+        amd64 = TRUE;
+    }
+
     OptionsDlgInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*OptionsDlgInfo));
     if (OptionsDlgInfo != NULL)
     {
         ZeroMemory(OptionsDlgInfo, sizeof(OPTIONS_DLG));
+        if (amd64)
+        DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG64), 0, DlgProc, (LPARAM)OptionsDlgInfo);
+        else
         DialogBoxParam(hInst, MAKEINTRESOURCE(ID_DIALOG), 0, DlgProc, (LPARAM)OptionsDlgInfo);
         HeapFree(GetProcessHeap(), 0, OptionsDlgInfo);
     }

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.h [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -14,6 +14,7 @@
 #include <wchar.h>
 #include "resources.h"

+#define MINGWVERSION64 L"\amd64"
 #define MINGWVERSION L"\i386"

typedef struct _SETTINGS
@@ -38,3 +39,4 @@
 SETTINGS, *PSETTINGS;

wchar_t *wcsset(wchar_t *string, wchar_t c);
+BOOL amd64 = FALSE;

Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con...
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/resources.h [iso-8859-1] Mon Dec  7 14:16:46 2009
@@ -45,39 +45,40 @@
 #define ID_BROWSEOBJ 0x20
 #define ID_BROWSEOUT 0x21
 #define ID_DIALOG 0x22
-#define ID_EXAMPLE 0x23
-#define IDC_FONT 0x24
-#define IDC_BACK 0x25
-#define ID_STATUSBAR 0x26
-#define ID_NOSTRIP 0x27
-#define ID_SHOWVERSION 0x28
+#define ID_DIALOG64 0x23
+#define ID_EXAMPLE 0x24
+#define IDC_FONT 0x25
+#define IDC_BACK 0x26
+#define ID_STATUSBAR 0x27
+#define ID_NOSTRIP 0x28
+#define ID_SHOWVERSION 0x29

/* Strings */
-#define MSG_NOGCCFOUND 0x29
-#define MSG_CMDFFAILED 0x2a
-#define MSG_PS1FFAILED 0x2b
-#define MSG_DIREFAILED 0x2c
-#define MSG_SETLOADSUC 0x2d
-#define MSG_FINDLOGDIR 0x2e
-#define MSG_FINDMGWDIR 0x2f
-#define MSG_FINDOBJDIR 0x30
-#define MSG_FINDOUTDIR 0x31
-#define MSG_WARNINGBOX 0x32
-#define MSG_EXITCHANGE 0x33
-#define MSG_INVALIDDIR 0x34
+#define MSG_NOGCCFOUND 0x2a
+#define MSG_CMDFFAILED 0x2b
+#define MSG_PS1FFAILED 0x2c
+#define MSG_DIREFAILED 0x2d
+#define MSG_SETLOADSUC 0x2e
+#define MSG_FINDLOGDIR 0x2f
+#define MSG_FINDMGWDIR 0x30
+#define MSG_FINDOBJDIR 0x31
+#define MSG_FINDOUTDIR 0x32
+#define MSG_WARNINGBOX 0x33
+#define MSG_EXITCHANGE 0x34
+#define MSG_INVALIDDIR 0x35

/* Help Strings */
-#define HLP_BACKCOLORC 0x35
-#define HLP_FONTCOLORC 0x36
-#define HLP_SBUILDTIME 0x37
-#define HLP_CCACHEUSED 0x38
-#define HLP_STRIPEDEXE 0x39
-#define HLP_FINDMGWDIR 0x3a
-#define HLP_FINDLOGDIR 0x3b
-#define HLP_FINDOBJDIR 0x3c
-#define HLP_FINDOUTDIR 0x3d
-#define HLP_SAVEBUTTON 0x3e
-#define HLP_QUITBUTTON 0x3f
-#define HLP_DEFAULTMSG 0x40
-#define HLP_NOSTRIP    0x41
-#define HLP_VERSION    0x42
+#define HLP_BACKCOLORC 0x36
+#define HLP_FONTCOLORC 0x37
+#define HLP_SBUILDTIME 0x38
+#define HLP_CCACHEUSED 0x39
+#define HLP_STRIPEDEXE 0x3a
+#define HLP_FINDMGWDIR 0x3b
+#define HLP_FINDLOGDIR 0x3c
+#define HLP_FINDOBJDIR 0x3d
+#define HLP_FINDOUTDIR 0x3e
+#define HLP_SAVEBUTTON 0x3f
+#define HLP_QUITBUTTON 0x40
+#define HLP_DEFAULTMSG 0x41
+#define HLP_NOSTRIP    0x42
+#define HLP_VERSION    0x43