diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-02-22 23:19:22 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-22 23:21:22 +0200 |
| commit | fd56eb98e63b4aac12c9633d5847a3fb964f326d (patch) | |
| tree | a11fd2818e25e2048ab163edad9dfefd6215f910 /sal/Module_sal.mk | |
| parent | 3eaa536ae457391c3826be50b0361f8d0c13cdd3 (diff) | |
Not using NativeActivity means no lo_main() stuff used either
Hopefully also fixes build for iOS by re-introducing checks for DESKTOP.
Also this commit partially reverts 52a8744afee2cd589813f0377d93f821fce7aedd.
Change-Id: Ie94c771b72ba138bb0481b054285916618baf6eb
Diffstat (limited to 'sal/Module_sal.mk')
| -rw-r--r-- | sal/Module_sal.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index af97e4805703..7d20fa388992 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -31,7 +31,8 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ CustomTarget_generated \ CustomTarget_sal_allheaders \ - Executable_cppunittester \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ + Executable_cppunittester) \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ @@ -45,13 +46,14 @@ $(eval $(call gb_Module_add_targets,sal,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,sal,\ Executable_osl_process_child \ )) + $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_sal_osl_process \ )) -endif $(eval $(call gb_Module_add_check_targets,sal,\ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \ @@ -88,6 +90,8 @@ $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_sal_rtl_math \ )) +endif + # CppunitTest_sal_osl_pipe has circular dependency on unotest # $(eval $(call gb_Module_add_subsequentcheck_targets,sal,\ CppunitTest_sal_osl_pipe \ |