Commit Graph

17 Commits

Author SHA1 Message Date
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
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
f3e103598e INTEGRATION: CWS jsc21 (1.9.74); FILE MERGED
2008/07/07 11:37:32 jsc 1.9.74.4: #i88797# adapted
2008/06/27 08:49:51 jsc 1.9.74.3: #i90032# adapt link flags and linking for MacOS
2008/06/20 08:11:11 jsc 1.9.74.2: #i88797# improve Makefile
2008/05/21 14:53:13 jsc 1.9.74.1: #i88797# adapted to new structure
2008-07-11 13:21:12 +00:00
0151a3e4c4 INTEGRATION: CWS jsc17 (1.8.8); FILE MERGED
2007/01/22 15:35:28 jsc 1.8.8.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
2007-01-25 10:05:49 +00:00
b38cda588a INTEGRATION: CWS jsc15 (1.7.118); FILE MERGED
2006/11/24 12:54:06 jsc 1.7.118.1: #i68136# insert manifest linking for VC8
2006-12-20 11:24:29 +00:00
6c2c8c6736 INTEGRATION: CWS sdkbugfix01 (1.6.6); FILE MERGED
2005/02/17 12:55:53 jsc 1.6.6.1: #i42941# correct typo
2005-03-01 11:08:41 +00:00
f41c3694cf INTEGRATION: CWS sdksample (1.5.4); FILE MERGED
2005/01/28 14:15:22 jsc 1.5.4.8: #i29308# prepare path for del command (windows only)
2004/10/29 07:33:45 jsc 1.5.4.7: #i29308# cleanup
2004/10/25 12:58:50 jsc 1.5.4.6: #i29308# minimize exported symbols
2004/10/22 14:19:16 jsc 1.5.4.5: #i29308# replace DKREGISTRYNAME with OFFICE_TYPE_LIBRARY
2004/10/22 10:00:12 jsc 1.5.4.4: #i35871# adapt for Java 5.0
2004/10/08 13:58:40 jsc 1.5.4.3: #i29308# insert package manifest
2004/08/24 15:04:22 jsc 1.5.4.2: #i29308# use of new UNO package extension
2004/06/17 11:08:55 jsc 1.5.4.1: #i29308# clean library
2005-01-31 15:20:44 +00:00
e7bd9d4699 INTEGRATION: CWS sdk13 (1.4.94); FILE MERGED
2004/05/05 09:31:22 jsc 1.4.94.1: #116658# merge cinnabar changes
2004-05-18 12:23:12 +00:00
86fc1406d4 INTEGRATION: CWS sdk06 (1.3.2); FILE MERGED
2003/07/03 14:54:01 jsc 1.3.2.1: #110588# insert subst command to correct slashes for Windows < XP
2003-07-09 09:37:59 +00:00
1cba96d3be INTEGRATION: CWS sdk04 (1.2.6); FILE MERGED
2003/06/24 13:33:36 jsc 1.2.6.1: #110313# insert source license header
2003-06-30 14:18:13 +00:00
c263ef7d43 INTEGRATION: CWS sdk02 (1.1.2); FILE ADDED
2003/05/09 11:19:32 jsc 1.1.2.1: #109045# insert new and remove example zip file
2003-06-10 09:17:22 +00:00