Commit Graph

21 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
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
40487924f7 #i106627# extend and adapt env for VC9, building manifest, change macro 2009-11-05 14:21:50 +00:00
3026960119 INTEGRATION: CWS jsc21 (1.13.74); FILE MERGED
2008/06/27 08:49:54 jsc 1.13.74.2: #i90032# adapt link flags and linking for MacOS
2008/05/21 13:19:20 jsc 1.13.74.1: #i88797# adapted to new structure
2008-07-11 13:27:53 +00:00
19a6b711b3 INTEGRATION: CWS jsc17 (1.12.8); FILE MERGED
2007/01/22 13:31:40 jsc 1.12.8.1: #i72793# integrate patch and verify all C++ makefile
2007-01-25 10:08:54 +00:00
1fb4df278b INTEGRATION: CWS jsc15 (1.11.46); FILE MERGED
2006/11/24 12:51:55 jsc 1.11.46.1: #i68136# insert manifest linking
2006-12-20 11:25:56 +00:00
f3dde21c67 INTEGRATION: CWS jsc8 (1.10.58); FILE MERGED
2006/06/19 08:27:59 jsc 1.10.58.1: #i66541# increase sleep time
2006-07-13 11:03:09 +00:00
9edfff7155 INTEGRATION: CWS sdkbugfix02 (1.9.10); FILE MERGED
2005/03/03 15:42:06 jsc 1.9.10.1: #41142# replace make with internal MAKE variable
2005-03-29 11:15:43 +00:00
b744b1a9a5 INTEGRATION: CWS sdksample (1.8.4); FILE MERGED
2005/01/28 10:06:01 jsc 1.8.4.5: #i29308# prepare path for del command (windows only)
2004/11/11 10:33:54 jsc 1.8.4.4: #i29308# adapted
2004/10/25 12:58:54 jsc 1.8.4.3: #i29308# minimize exported symbols
2004/10/22 14:13:35 jsc 1.8.4.2: #i29308# insert --singleaccept
2004/07/21 12:45:39 jsc 1.8.4.1: i29308# wait for server on UNIX
2005-01-31 16:07:55 +00:00
b070508712 INTEGRATION: CWS sdk13 (1.7.20); FILE MERGED
2004/05/07 07:26:48 jsc 1.7.20.2: #i27128# use macro for regcomp
2004/05/05 09:31:42 jsc 1.7.20.1: #116658# merge cinnabar changes
2004-05-18 12:29:50 +00:00
bba5017bb0 INTEGRATION: CWS geordi2q14 (1.6.72); FILE MERGED
2004/01/30 13:11:45 hr 1.6.72.1: #111934#: merge CWS ooo111fix2
2004-02-02 19:08:11 +00:00
dd3171d39b INTEGRATION: CWS sdk04 (1.5.6); FILE MERGED
2003/06/24 11:08:27 jsc 1.5.6.1: #110313# insert source license header
2003-06-30 14:53:19 +00:00
56ad794841 INTEGRATION: CWS sdk02 (1.4.10); FILE MERGED
2003/05/16 14:01:30 jsc 1.4.10.1: #109045# improve build process
2003-06-10 09:46:09 +00:00
38741f87cf INTEGRATION: CWS uno2 (1.1.4.1.18); FILE MERGED
2003/04/14 10:11:04 jsc 1.1.4.1.18.1: #107991# new naming convention for uno components
2003-04-23 15:50:16 +00:00
e645add5d9 INTEGRATION: CWS sdk01 (1.1.4.1.6); FILE MERGED
2003/04/12 10:13:52 jsc 1.1.4.1.6.2: #108799# new naming convention
2003/04/10 11:34:35 jsc 1.1.4.1.6.1: #108799# use new naming convention for uno components
2003-04-17 08:41:58 +00:00
62c63d3402 MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-26 12:40:54 +00:00