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/Library_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/Library_sal.mk')
| -rw-r--r-- | sal/Library_sal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 1d8846096bd9..62f9ce3f3a11 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -181,7 +181,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/module \ sal/osl/unx/process \ sal/osl/unx/process_impl \ - sal/osl/unx/salinit \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \ sal/osl/unx/uunxapi \ )) $(eval $(call gb_Library_add_cobjects,sal,\ |