Author: akhaldi Date: Mon Feb 27 22:52:09 2012 New Revision: 55892
URL: http://svn.reactos.org/svn/reactos?rev=55892&view=rev Log: [CMAKE] * Remove some accidental changes. [INETCPL] * Include the correct pt language rc file.
Modified: trunk/reactos/CMakeLists.txt trunk/reactos/configure.cmd trunk/reactos/dll/cpl/inetcpl/inetcpl.rc
Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=55892&am... ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon Feb 27 22:52:09 2012 @@ -155,6 +155,7 @@
# Compiler specific definitions and macros if(MSVC) + include(cmake/msvc.cmake) else() include(cmake/gcc.cmake) endif()
Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=55892&... ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Mon Feb 27 22:52:09 2012 @@ -146,7 +146,7 @@ )
if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=1 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% ) else if "%BUILD_ENVIRONMENT%" == "WDK" ( cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% ) else (
Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc?... ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Mon Feb 27 22:52:09 2012 @@ -51,8 +51,8 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif -#ifdef LANGUAGE_PT_PT - #include "lang/pt-PT.rc" +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" #endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc"