Commit Graph

26 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
aab14cb9fb fix prefix of command line switches (-- instead of -) 2012-01-11 19:25:45 +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
8e8fc2abfa jsc340: i114609: adapt examples to work with the URE and use the passive registration 2011-03-01 09:48:57 +01:00
01f92dfffd jsc340: i114609: adapt examples to work with the URE and use the passive registration 2011-02-28 14:10:02 +01:00
1628005298 Trying to remove the stlport mention from the code 2011-02-09 16:20:25 +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
bbd00a6753 INTEGRATION: CWS jsc21 (1.17.198); FILE MERGED
2008/06/27 08:49:53 jsc 1.17.198.3: #i90032# adapt link flags and linking for MacOS
2008/05/21 13:13:34 jsc 1.17.198.2: #i88797# adapted to new structure
2008/05/21 12:55:39 jsc 1.17.198.1: #i88797# adapted to new structure
2008-07-11 13:25:54 +00:00
8277f6fb82 INTEGRATION: CWS sdkbugfix02 (1.16.10); FILE MERGED
2005/03/03 15:42:05 jsc 1.16.10.1: #41142# replace make with internal MAKE variable
2005-03-29 11:15:10 +00:00
a381fcc1f3 INTEGRATION: CWS sdksample (1.15.4); FILE MERGED
2005/01/28 10:06:00 jsc 1.15.4.7: #i29308# prepare path for del command (windows only)
2005/01/12 15:17:56 jsc 1.15.4.6: #i39890# change to new OpenDocument format
2004/11/02 17:08:24 jsc 1.15.4.5: #i29308# remove start office target
2004/11/02 14:41:06 jsc 1.15.4.4: #i29308# improved
2004/10/22 14:19:18 jsc 1.15.4.3: #i29308# replace DKREGISTRYNAME with OFFICE_TYPE_LIBRARY
2004/08/04 12:39:17 jsc 1.15.4.2: #i29308# improved
2004/07/21 14:28:53 jsc 1.15.4.1: #i29308# insert Note for for usage
2005-01-31 16:02:18 +00:00
af381fbfdd INTEGRATION: CWS sdk13 (1.14.94); FILE MERGED
2004/05/07 07:26:47 jsc 1.14.94.2: #i27128# use macro for regcomp
2004/05/05 09:31:41 jsc 1.14.94.1: #116658# merge cinnabar changes
2004-05-18 12:29:24 +00:00
37b64956fc INTEGRATION: CWS sdk06 (1.13.2); FILE MERGED
2003/07/03 14:54:16 jsc 1.13.2.1: #110588# insert subst command to correct slashes for Windows < XP
2003-07-09 09:40:26 +00:00
979f1ae367 INTEGRATION: CWS sdk04 (1.12.6); FILE MERGED
2003/06/24 11:08:24 jsc 1.12.6.1: #110313# insert source license header
2003-06-30 14:52:16 +00:00
b904fc4a0b INTEGRATION: CWS sdk02 (1.11.10); FILE MERGED
2003/05/16 14:01:25 jsc 1.11.10.1: #109045# improve build process
2003-06-10 09:45:41 +00:00
846604f001 INTEGRATION: CWS uno2 (1.5.10.1.18); FILE MERGED
2003/04/14 10:11:03 jsc 1.5.10.1.18.1: #107991# new naming convention for uno components
2003-04-23 15:50:06 +00:00
c477b1152b INTEGRATION: CWS sdk01 (1.5.10.1.6); FILE MERGED
2003/03/13 11:38:24 jsc 1.5.10.1.6.1: #108153# improve usability
2003-04-17 08:40:28 +00:00
62c63d3402 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-26 12:40:54 +00:00
278f0b4264 #107931# synch with OOO_STABLE_1 2003-02-28 16:11:34 +00:00
c1d7ce84fd #99053# to be synchronized with OOO_STABLE_1 2003-01-31 16:08:36 +00:00
c49fe44c24 #99053# modified, new build env 2002-12-19 09:03:12 +00:00
12532f7cef #99053# mdofiy Makefile for working in the new structure 2002-07-29 13:04:14 +00:00
50a67a7605 #87796# link stlport library and under linux also supC++ 2001-12-17 16:07:12 +00:00
2a4cf08dfe #87796# use the server side component context 2001-12-05 12:19:09 +00:00
5d2e49cabd #87796# Replaced XMultiServiceFactory with XMultiComponentFactory. 2001-11-27 15:41:32 +00:00
fa0f2ddade #87796# Added CPP example DocumentLoader. 2001-11-26 13:26:01 +00:00