Commit Graph

27 Commits

Author SHA1 Message Date
ae1bb97f14 remove last uses of config 'GUI' variable
Change-Id: I97188235f0b72b5b54423e05deeaf17c5c681048
Reviewed-on: https://gerrit.libreoffice.org/4188
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2013-06-20 11:51:10 +00:00
96907bfb02 np_sdk: remove both Package_inc and Package_npapi
This is a bit of a mess, apparently there are some headers here that may
come from the system and others that are always internal?

Change-Id: Ifbf486d3016bc87849e2593d83b3d48dae3aeca0
2013-05-07 01:41:25 +02:00
72e5d0c8fb Move to MPLv2 license headers, with ESC decision and author's permission. 2013-04-30 13:34:06 +01:00
5a61e28378 gbuild: fix silly "expandtabs" in makefile VIM modelines
Change-Id: I54d8923ad315e8041fd3904da3a29f1a7a8c8b16
2013-01-26 22:20:07 +01:00
a53586f4ef gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
2013-01-26 22:20:06 +01:00
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
12152d253e Replace GUIBASE checks with equivalent OS checks
The idea is to get rid of GUIBASE and GUI checks as much as possible.

GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID

Don't set GUIBASE to these values any more in configure.ac
either.

GUIBASE_FOR_BUILD is not used anywhere.

Conflicts:
	configure.ac
	postprocess/packcomponents/makefile.mk
	postprocess/packregistry/makefile.mk

Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
2012-12-18 20:52:24 -05:00
13ef9dcc20 Rename "Mozilla headers" to "NPAPI headers" (incl. configure option name)
...to avoid confusion what that is actually about.  (Especially, it is
completely unrelated to --enable-mozilla.)

ATTENTION:  This renames the configure option --with-system-mozilla-headers to
--with-system-npapi-headers.

Change-Id: I48f3c79d69c4d4f445a94e7ddbeab06ea667becc
2012-11-15 18:15:43 +01:00
5032dc0fc3 gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.

Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
2012-09-28 16:49:08 +02:00
dc397aae70 gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT:
add a new gb_LinkTarget_use_system_win32_libs to abstract different
linker options on MSVC and GCC.

Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d
2012-09-28 16:49:08 +02:00
cee32aae39 gbuild: clean up Mac OS X framework handling:
There are currently 3 different mechanisms being used for frameworks,
which is of course intolerable so we invent a 4th one and standardize on
it:  gb_LinkTarget_use_darwin_frameworks

(This doesn't mean using add_libs or externals was wrong, it was just
inconsistent... and i don't see an obvious benefit of using externals here)

Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d
2012-09-28 16:49:07 +02:00
b85c349783 gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
2012-09-28 16:49:06 +02:00
2e677c3981 gbuild: split uwinapi out of gb_STDLIBS
Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7
2012-09-28 16:49:05 +02:00
fdda178d88 targetted improvement of UNO API includes / usage 2012-07-02 14:43:34 +01:00
8f6510b31f np_sdk: separate system and internal headers
Change-Id: I4c61dcb40acf12fa0fe4cf4d6c39a8bfd7b7c9b4
2012-06-02 23:38:01 +02:00
449582407a extensions: add np_sdk_inc to mozilla_headers external 2012-04-08 01:05:53 +02:00
c923f7d2c2 gbuild: "use" vs. "add":
Naming convention for gbuild methods:
- "add" is used for stuff that is logically a part of the target
  (i.e. not registered at the Module, but defined in the target's makefile)
- "use" is used for stuff that is logically a different target
  (i.e. it is registered at the Module, has it's own makefile, may be
  in a different module than the target)
2012-04-08 01:05:52 +02:00
5926ce12ed extensions: split out static library for X11 plugin connection stuff 2012-03-12 18:30:33 +01:00
134803653f tweak makefiles after np_sdk is in tail_build
Also change <npsdk/npapi.h> to "npapi.h"
2012-01-11 20:20:17 +01:00
84c33ebf34 Make nsplugin build on Mac, take two.
Now with some help from Michael Stahl - seems to work.
2012-01-10 17:33:50 +01:00
a2dd79d14e Make nsplugin link on Mac. 2012-01-10 16:11:17 +01:00
bec239e847 extensions: plugin: fix build a bit more on Mac 2012-01-10 10:38:41 +01:00
29f897054d extensions/Library_pl: move macmgr.cxx -> macmgr.mm 2012-01-09 12:42:35 +01:00
b181742091 extensions: pl: link comphelper (bacfd2dc) 2012-01-06 21:16:06 +01:00
6716631b35 extensions: d'oh, i've pasted C++ emacs modelines in makefiles 2011-12-19 22:09:48 +01:00
fc75a11371 extensions: tweaks to the plugin makefiles 2011-12-17 22:11:57 +01:00
a80a5ab4f6 extensions: convert plugin to gbuild 2011-12-17 22:11:57 +01:00