configure.in | 4 ++++ scp2/inc/macros.inc | 2 +- scp2/source/ooo/common_brand.scp | 2 +- scp2/source/ooo/file_library_ooo.scp | 6 +++--- scp2/source/ooo/makefile.mk | 4 ---- scp2/source/ooo/ure.scp | 28 ++++++++++++++-------------- 6 files changed, 23 insertions(+), 23 deletions(-)
New commits: commit 23fa04ddda57f710c01f96113cb1b17ff4eafa77 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Jan 18 17:50:48 2012 +0200 _MSC_VER is compiler define and cpp.lcc needs to be taught about it (cherry picked from commit d3f17ac97d1d90069fd66ccc63caab0f0472dc7d) Signed-off-by: Tor Lillqvist <tlillqv...@suse.com> diff --git a/configure.in b/configure.in index c66a6c5..b15f76c 100644 --- a/configure.in +++ b/configure.in @@ -160,6 +160,10 @@ cygwin*|interix*|mingw32*) fi ;; esac + + if test "$build_os" = "cygwin" ; then + SCPDEFS="$SCPDEFS -D_MSC_VER" + fi ;; darwin*) # Mac OS X or iOS diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4f23947..5f770f7 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -511,7 +511,7 @@ End #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin #define SCP2_URE_DL_NORMAL(n) n ".dll" #define SCP2_URE_DL_BARE(n) n ".dll" -#if defined _MSC +#if defined _MSC_VER #define SCP2_URE_DL_VER(n, v) n v ".dll" #define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll" #define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll" diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 474d537..6c6fb66 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -554,7 +554,7 @@ End #endif // use this for high detail file open dialog >= 5.1 windows -#if defined(WNT) && defined( _MSC ) +#if defined( _MSC_VER ) File gid_Brand_File_Bin_Soffice_Bin_Manifest TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index ef75e8c..abcfec4 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -97,7 +97,7 @@ STD_LIB_FILE(gid_File_Lib_Charttools, charttools) STD_LIB_FILE(gid_File_Lib_Chartview, chartview) -#if defined WNT && defined _MSC +#if defined _MSC_VER File gid_File_Lib_Cli_Oootypes_Assembly TXT_FILE_BODY; @@ -114,7 +114,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Oootypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -130,7 +130,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Oootypes_Config TXT_FILE_BODY; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 112eed7..854cd69 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -35,10 +35,6 @@ TARGETTYPE=CUI .INCLUDE : settings.mk .INCLUDE : i18npool/version.mk -.IF "$(COM)" == "MSC" -SCPDEFS+=-D_MSC -.ENDIF - .IF "$(ENABLE_ONLINE_UPDATE)"!="" SCPDEFS+=-DENABLE_ONLINE_UPDATE .ENDIF diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index d17c0b7..be2418f 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Uno LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; @@ -466,7 +466,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Ure_Assembly TXT_FILE_BODY; @@ -483,7 +483,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Ure_Config TXT_FILE_BODY; @@ -495,7 +495,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -512,7 +512,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Basetypes_Config TXT_FILE_BODY; @@ -541,7 +541,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -558,7 +558,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -575,7 +575,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Dl_Policy_Cli_Uretypes_Config TXT_FILE_BODY; @@ -587,7 +587,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -604,7 +604,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -621,7 +621,7 @@ End #endif -#if defined _MSC +#if defined _MSC_VER File gid_File_Lib_Policy_Cli_Cppuhelper_Config TXT_FILE_BODY; @@ -868,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif #endif -#elif defined _MSC +#elif defined _MSC_VER #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else commit 90e3a130dbf1badc10d5d5e131fea6f5afb98869 Author: Fridrich Å trba <fridrich.st...@bluewin.ch> Date: Wed Jan 18 15:13:15 2012 +0100 If COM==_MSC, then OS==WNT and also GUI==WNT (cherry picked from commit 7f1d77d9fecdd710d2b2fd17be91a61665baf846) Signed-off-by: Tor Lillqvist <tlillqv...@suse.com> diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index a7cafa8..d17c0b7 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -439,7 +439,7 @@ File gid_File_Dl_LogUnoUno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Uno LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -449,7 +449,7 @@ File gid_File_Dl_Cli_Uno End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; @@ -466,7 +466,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Ure_Assembly TXT_FILE_BODY; @@ -483,7 +483,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Ure_Config TXT_FILE_BODY; @@ -495,7 +495,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -512,7 +512,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Basetypes_Assembly TXT_FILE_BODY; @@ -528,7 +528,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Basetypes_Config TXT_FILE_BODY; @@ -541,7 +541,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -558,7 +558,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Uretypes_Assembly TXT_FILE_BODY; @@ -575,7 +575,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Dl_Policy_Cli_Uretypes_Config TXT_FILE_BODY; @@ -587,7 +587,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -604,7 +604,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly TXT_FILE_BODY; @@ -621,7 +621,7 @@ End #endif -#if defined WNT && defined _MSC +#if defined _MSC File gid_File_Lib_Policy_Cli_Cppuhelper_Config TXT_FILE_BODY; @@ -868,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif #endif -#elif defined WNT && defined _MSC +#elif defined _MSC #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits