feature/gbuild_shell is finished
Norbert Thiebaud
nthiebaud at gmail.com
Tue May 1 20:52:34 PDT 2012
David,
the following seesm to help a bit on Windows..
but not enough
$ git diff
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 562bbf3..3464a66 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_libraries,shlxthdl,\
$(eval $(call gb_Library_use_static_libraries,shlxthdl,\
shlxthandler_common \
+ shell_xmlparser \
))
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 2affe1e..c6fd400 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Library_use_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
shlxthandler_common_x64 \
+ shell_xmlparser_x64 \
))
after that I get
[ build LNK ] Library/iooofilt.lib
S=C:/lo/core && O=$S/solver/wntmsci12.pro &&
W=$S/workdir/wntmsci12.pro && mkdir -p $W/LinkTarget/Library/ && rm
-f $W/LinkTarget/Library/iooofilt.lib &&
RESPONSEFILE=C:/cygwin/tmp/gbuild.VT8elO && link -DLL -release
-opt:noref -incremental:no -debug -nxcompat -dynamicbase
-SUBSYSTEM:CONSOLE -MACHINE:IX86 -VERBOSE:LIB -MANIFEST
-LIBPATH:$O/lib -LIBPATH:C:/PROGRA~2/MICROS~1.0/VC/lib
-LIBPATH:C:/PROGRA~1/MICROS~2/Windows/v7.1/lib
-LIBPATH:C:/PROGRA~1/MICROS~2/Windows/v7.1/lib
-LIBPATH:C:/PROGRA~2/MI0FC3~1/lib/x86 @${RESPONSEFILE} advapi32.lib
comctl32.lib kernel32.lib ole32.lib shell32.lib uuid.lib oldnames.lib
msvcprt.lib msvcprt.lib expat_xmlparse.lib expat_xmltok.lib zlib.lib
shell_xmlparser.lib shlxthandler_common.lib user32.lib
-out:$W/LinkTarget/Library/ooofilt.dll
-implib:$W/LinkTarget/Library/iooofilt.lib; RC=$?; rm ${RESPONSEFILE}
; if [ ! -f $W/LinkTarget/Library/ooofilt.dll ]; then rm -f
$W/LinkTarget/Library/iooofilt.lib && false; fi ; if [ -f
$W/LinkTarget/Library/ooofilt.dll.manifest ]; then mt.exe -manifest
$W/LinkTarget/Library/ooofilt.dll.manifest
-outputresource:$W/LinkTarget/Library/ooofilt.dll\;2; fi ; exit $RC
Microsoft (R) Incremental Linker Version 9.00.21022.08
Copyright (C) Microsoft Corporation. All rights reserved.
C:/lo/core/workdir/wntmsci12.pro/CxxObject/shell/source/win32/shlxthandler/ooofilt/ooofilt.o
C:/lo/core/workdir/wntmsci12.pro/CxxObject/shell/source/win32/shlxthandler/ooofilt/propspec.o
C:/lo/core/workdir/wntmsci12.pro/WinResTarget/ooofilt/default.res
Searching libraries
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\advapi32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\comctl32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\kernel32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\ole32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\shell32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\uuid.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\oldnames.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\msvcprt.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmlparse.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmltok.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\zlib.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shell_xmlparser.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shlxthandler_common.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\user32.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\MSVCRT.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\LIBCMT.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\advapi32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\comctl32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\kernel32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\ole32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\shell32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\uuid.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\oldnames.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\msvcprt.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmlparse.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmltok.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\zlib.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shell_xmlparser.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shlxthandler_common.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\user32.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\MSVCRT.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\LIBCMT.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\advapi32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\comctl32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\kernel32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\ole32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\shell32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\uuid.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\oldnames.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\msvcprt.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmlparse.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmltok.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\zlib.lib:
Finished searching libraries
LINK : warning LNK4098: defaultlib 'LIBCMT' conflicts with use of
other libs; use /NODEFAULTLIB:library
Searching libraries
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\advapi32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\comctl32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\kernel32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\ole32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\shell32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\uuid.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\oldnames.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\msvcprt.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmlparse.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmltok.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\zlib.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shell_xmlparser.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shlxthandler_common.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\user32.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\MSVCRT.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\LIBCMT.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\advapi32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\comctl32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\kernel32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\ole32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\shell32.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\uuid.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\oldnames.lib:
Searching C:/PROGRA~2/MICROS~1.0/VC/lib\msvcprt.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmlparse.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\expat_xmltok.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\zlib.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shell_xmlparser.lib:
Searching C:/lo/core/solver/wntmsci12.pro/lib\shlxthandler_common.lib:
Searching C:/PROGRA~1/MICROS~2/Windows/v7.1/lib\user32.lib:
Finished searching libraries
Microsoft (R) Manifest Tool version 6.1.7716.0
Copyright (c) Microsoft Corporation 2009.
All rights reserved.
TEMPFILE=C:/cygwin/tmp/gbuild.Pd0uDq && mv ${TEMPFILE}
/cygdrive/c/lo/core/workdir/wntmsci12.pro/LinkTarget/Library/iooofilt.lib.objectlist
S=/cygdrive/c/lo/core && O=$S/solver/wntmsci12.pro &&
W=$S/workdir/wntmsci12.pro && /usr/bin/cp --no-dereference --force
--preserve=timestamps $W/LinkTarget/Library/iooofilt.lib
$O/lib/iooofilt.lib && /usr/bin/cp --no-dereference --force
--preserve=timestamps $W/LinkTarget/Library//ooofilt.dll
$O/bin/ooofilt.dll
/usr/bin/cp: cannot stat
`/cygdrive/c/lo/core/workdir/wntmsci12.pro/LinkTarget/Library/iooofilt.lib':
No such file or directory
make: *** [/cygdrive/c/lo/core/solver/wntmsci12.pro/lib/iooofilt.lib] Error 1
Note: I added -VERBOSE:LIB to try to figure out the link warning...
Norbert
More information about the LibreOffice
mailing list