diff options
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/Executable_climaker.mk | 7 | ||||
| -rw-r--r-- | cli_ure/Library_cli_cppuhelper_native.mk | 13 | ||||
| -rw-r--r-- | cli_ure/Library_cli_uno.mk | 9 |
3 files changed, 5 insertions, 24 deletions
diff --git a/cli_ure/Executable_climaker.mk b/cli_ure/Executable_climaker.mk index 298f01ebf45f..6f1a37b8ce10 100644 --- a/cli_ure/Executable_climaker.mk +++ b/cli_ure/Executable_climaker.mk @@ -13,11 +13,8 @@ $(eval $(call gb_Executable_use_package,climaker,\ cli_basetypes_copy \ )) -$(eval $(call gb_Executable_add_cxxflags,climaker,\ - -AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \ - -EHa -clr \ +$(eval $(call gb_Executable_add_cxxclrflags,climaker,\ -LN \ - -wd4339 \ -wd4715 \ )) @@ -43,7 +40,7 @@ $(eval $(call gb_Executable_use_system_win32_libs,climaker,\ msvcmrt \ )) -$(eval $(call gb_Executable_add_exception_objects,climaker,\ +$(eval $(call gb_Executable_add_cxxclrobjects,climaker,\ cli_ure/source/climaker/climaker_app \ cli_ure/source/climaker/climaker_emit \ )) diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 52314a3baeaa..bb230fb0108d 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -11,15 +11,6 @@ include $(SRCDIR)/cli_ure/version/version.txt $(eval $(call gb_Library_Assembly,cli_cppuhelper)) -# When compiling for CLR, disable "warning C4339: use of undefined type detected -# in CLR meta-data - use of this type may lead to a runtime exception": -$(eval $(call gb_Library_add_cxxflags,cli_cppuhelper,\ - -AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \ - -EHa \ - -clr \ - -wd4339 \ -)) - $(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\ -ignore:4248 \ -keyfile:$(SRCDIR)/cli_ure/source/cliuno.snk \ @@ -48,12 +39,12 @@ $(eval $(call gb_Library_use_system_win32_libs,cli_cppuhelper,\ msvcmrt \ )) -$(eval $(call gb_Library_add_exception_objects,cli_cppuhelper,\ +$(eval $(call gb_Library_add_cxxclrobjects,cli_cppuhelper,\ cli_ure/source/native/native_bootstrap \ cli_ure/source/native/path \ )) -$(eval $(call gb_Library_add_generated_exception_objects,cli_cppuhelper,\ +$(eval $(call gb_Library_add_generated_cxxclrobjects,cli_cppuhelper,\ CustomTarget/cli_ure/source/native/assembly \ )) diff --git a/cli_ure/Library_cli_uno.mk b/cli_ure/Library_cli_uno.mk index 0629a171ec6c..75eadae723d6 100644 --- a/cli_ure/Library_cli_uno.mk +++ b/cli_ure/Library_cli_uno.mk @@ -9,13 +9,6 @@ $(eval $(call gb_Library_Library,cli_uno)) -$(eval $(call gb_Library_add_cxxflags,cli_uno,\ - -AI $(INSTDIR)/$(LIBO_URE_LIB_FOLDER) \ - -EHa \ - -clr \ - -wd4339 \ -)) - $(eval $(call gb_Library_add_ldflags,cli_uno,\ -ignore:4248 \ )) @@ -32,7 +25,7 @@ $(eval $(call gb_Library_use_system_win32_libs,cli_uno,\ msvcmrt \ )) -$(eval $(call gb_Library_add_exception_objects,cli_uno,\ +$(eval $(call gb_Library_add_cxxclrobjects,cli_uno,\ cli_ure/source/uno_bridge/cli_bridge \ cli_ure/source/uno_bridge/cli_data \ cli_ure/source/uno_bridge/cli_environment \ |