| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
...rather, pass them from the build to the SDK installation via dk.mk. (The SDK
installation is already platform-specific anyway, see the binary executables in
its bin/ directory, so there is no point in not fixing this at build time. In
the future, the shipped settings.mk could of course be stripped to just the
parts relevant for a given platform, of course.)
Along the way, fixes some apparent "ppc" vs. "powerpc" typos in settings.mk.
Cherry picked from commit dea0398ee24eb278cdb14999efbf34d634454eaa "SDK
settings.mk: Don't guess PLATFORM/PROCTYPE" plus
e5ad31e2f784856506c28092166dc8704c84e868 "Fix Mac OS X 64 bit SDK settings.mk"
and b3db695a338f1acddbe46102138a0167fc346f58 "SDK: Split PLATFORMID at build
time rather than runtime" fix.
Conflicts:
odk/settings/settings.mk
Change-Id: Ib8e0c03ad6dfd610aae58a61e32bdc61c785584f
Reviewed-on: https://gerrit.libreoffice.org/7748
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I46f4954ef07f60e1f7824a47f0617f8612ea9505
|
|
Change-Id: Id88a58e43fd7a39fdbc7545a0618b05070b1270e
Reviewed-on: https://gerrit.libreoffice.org/3776
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: Iee97a510be822836b2115f50d0b1c9e7e14b5e1a
Reviewed-on: https://gerrit.libreoffice.org/3534
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
|
|
* Re-use existing settings/dk.mk to tunnel ENABLE_DEBUG into the SDK. Turns out
this was explicitly included in ~all examples Makefiles, but only after
settings.mk where it is now used, so include it in settings.mk now and dropped
it from all the exmaples Makefiles.
* The old settings.mk was apparently confused with using /MT ("link with
LIBCMT.LIB") on cl command line and /MD ("link with MSVCRT.LIB") on link
command line (where it was ignored), and you apparently can't pass both
together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp.
/MTd). No idea if that is exactly right, however.
* Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and
msvcrt.lib vs. msvcrtd.lib on Windows. Adapted examples Makefiles and
/ure/source/uretest/Makefile accordingly. Some examples Makefiles
additionally use msvcprt.lib, no idea whether that still needs to be
addressed.
Change-Id: Ia8d9d177e415abfbaf6f9fa6239f0ef9998868be
|
|
Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0
Reviewed-on: https://gerrit.libreoffice.org/2288
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
|
