Commit Graph

14 Commits

Author SHA1 Message Date
af572d9fbb Related: #i121577# Allow setting toolbar name in Addons.xcu
(cherry picked from commit 96cd87ec89e5ebe9d174c90b0f2cab96b3772732)

Conflicts:
	odk/examples/cpp/complextoolbarcontrols/CalcWindowState.xcu
	odk/examples/cpp/complextoolbarcontrols/WriterWindowState.xcu
	odk/examples/java/Inspector/Inspector.java

Change-Id: I6a0c1a657c6084df4efd8e150dc252155b32ba0b
2013-06-24 11:54:45 +01:00
5051209534 Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil
* 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
2013-04-19 14:02:18 +02:00
368210926b remove -dylib_file mappings that are not needed anymore
XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries
without explicit mapping, but as baseline is now 10.6, this
wrapping is no longer necessary

Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8
Reviewed-on: https://gerrit.libreoffice.org/3192
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-04-04 17:46:46 +00:00
2633b249ea odk: do not pack unused component.map file
Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-03-19 14:15:39 +01:00
934cdea97a -writer -> --writer
Change-Id: I78bd922b33d237f36c62ab27e1e383b456797e3a
2013-03-02 12:42:53 +01:00
11cdc4ccc4 Merge commit 'ooo/DEV300_m103'
Conflicts:
	odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx
	odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
	odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
	odk/examples/cpp/complextoolbarcontrols/exports.cxx
	odk/examples/cpp/counter/countermain.cxx
	odk/examples/cpp/remoteclient/remoteclient.cxx
	odk/settings/settings.mk
2011-03-23 16:59:36 +01:00
1628005298 Trying to remove the stlport mention from the code 2011-02-09 16:20:25 +01:00
134b85e8f8 jsc340: i114609: support passive component registration 2011-02-01 18:08:59 +01:00
1296914c84 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
40487924f7 #i106627# extend and adapt env for VC9, building manifest, change macro 2009-11-05 14:21:50 +00:00
6a83aea817 INTEGRATION: CWS jsc21 (1.4.74); FILE MERGED
2008/06/27 08:49:54 jsc 1.4.74.3: #i90032# adapt link flags and linking for MacOS
2008/05/21 12:13:15 jsc 1.4.74.2: #i88797# adapted to new structure
2008/05/21 12:11:29 jsc 1.4.74.1: #i88797# adapted to new structure
2008-07-11 13:26:28 +00:00
7c8a400652 INTEGRATION: CWS jsc17 (1.3.8); FILE MERGED
2007/01/22 15:35:31 jsc 1.3.8.2: #i73750# change UNOPKG_EXT to UNOOXT_EXT
2007/01/22 13:31:40 jsc 1.3.8.1: #i72793# integrate patch and verify all C++ makefile
2007-01-25 10:08:26 +00:00
902508ff69 INTEGRATION: CWS jsc15 (1.2.36); FILE MERGED
2006/11/24 12:51:54 jsc 1.2.36.1: #i68136# insert manifest linking
2006-12-20 11:25:26 +00:00
5eb9f58576 INTEGRATION: CWS odkaddonexample (1.1.2); FILE ADDED
2006/07/06 14:52:03 cd 1.1.2.3: #i65116# Added run target for testing
2006/05/16 08:48:03 cd 1.1.2.2: #i65116# Added new controls to demo add-on
2006/05/05 14:15:53 cd 1.1.2.1: #i65116# New demo add-on using the complex toolbar controls
2006-08-01 08:42:03 +00:00