diff options
-rw-r--r-- | configure.in | 26 | ||||
-rw-r--r-- | set_soenv.in | 1 | ||||
-rw-r--r-- | solenv/inc/wntmsci10.mk | 6 | ||||
-rw-r--r-- | solenv/inc/wntmsci11.mk | 6 |
4 files changed, 0 insertions, 39 deletions
diff --git a/configure.in b/configure.in index 9855b3b691fc..43910acea848 100644 --- a/configure.in +++ b/configure.in @@ -156,17 +156,6 @@ AC_ARG_ENABLE(crashdump, [Enable the crashdump feature code.]), ,) -AC_ARG_ENABLE(cl-standard, - AS_HELP_STRING([--enable-cl-standard], - [For Microsoft C/C++ compiler users, use non-optimizing standard - compiler.]) - [ - This just disables optimization options and therefore - removes a lot of warnings when using the cheaper - standard compiler. - ], -,) - AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [Determines whether to use Gtk+ vclplug on platforms where Gtk+ is available.]), @@ -1589,21 +1578,6 @@ if test "$_os" = "WINNT"; then BUILD_TYPE="$BUILD_TYPE TWAIN" fi -if test "$_os" = "WINNT"; then - dnl =================================================================== - dnl Set the VC_STANDARD variable. - dnl =================================================================== - AC_MSG_CHECKING([whether to use the standard non-optimizing compiler]) - if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then - VC_STANDARD="" - AC_MSG_RESULT([no]) - else - VC_STANDARD="TRUE" - AC_MSG_RESULT([yes]) - fi - AC_SUBST(VC_STANDARD) -fi - dnl =================================================================== dnl Set the ENABLE_WERROR variable. (Activate --enable-werror) dnl =================================================================== diff --git a/set_soenv.in b/set_soenv.in index 834bd34ae39c..fdf1c6af5c97 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1845,7 +1845,6 @@ ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e"); ToFile( "SYSTEM_GRAPHITE", "@SYSTEM_GRAPHITE@", "e"); ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e"); ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e"); -ToFile( "VC_STANDARD", "@VC_STANDARD@", "e" ); ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e"); ToFile( "SYSTEM_DICTS", "@SYSTEM_DICTS@", "e"); ToFile( "DICT_SYSTEM_DIR", "@DICT_SYSTEM_DIR@", "e"); diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk index 5c959f7d0e3c..fbdc0a471b95 100644 --- a/solenv/inc/wntmsci10.mk +++ b/solenv/inc/wntmsci10.mk @@ -78,12 +78,6 @@ CDEFS+= -D_X86_=1 CFLAGS+= -Gy .ENDIF # "$(product)" != "" -.IF "$(bndchk)" == "" -.IF "$(VC_STANDARD)"=="" -CFLAGS+= -Ob1 -.ENDIF # "$(VC_STANDARD)"=="" -.ENDIF - # flags to enable build with symbols; required for crashdump feature #CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB # full debug for RE builds only due to size concerns diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index 972feb0a8fdc..1cbe41afb0f4 100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -94,12 +94,6 @@ CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_ CFLAGS+= -Gy .ENDIF # "$(product)" != "" -.IF "$(bndchk)" == "" -.IF "$(VC_STANDARD)"=="" -CFLAGS+= -Ob1 -.ENDIF # "$(VC_STANDARD)"=="" -.ENDIF - # flags to enable build with symbols; required for crashdump feature #CFLAGSENABLESYMBOLS=-Zi -Fd$(MISC)/_ooo_st_$(TARGET).PDB CFLAGSENABLESYMBOLS=-Z7 -Yd |