[Libreoffice-commits] .: desktop/Executable_soffice.mk

2012-03-19 Thread Stephan Bergmann 
 desktop/Executable_soffice.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9019ccb42398b714666f045693e503780d9746ab
Author: Stephan Bergmann 
Date:   Mon Mar 19 14:18:51 2012 +0100

soffice.exe must not link against sal3.dll (might fix fdo#44489)

...as soffice.exe creates the proper environment (PATH) for soffice.bin to 
be
able to load URE libs like sal3.dll, so soffice.exe itself should neither be
able to load nor depend on sal3.dll (and does not depend on anything 
exported by
it, anyway).

It is unclear to me how this ever worked (which it presumably did?) with any
Windows build, either native MSVC or cross-compiled MinGW.  (Maybe MSVC 
builds
do not record a dependency from soffice.exe to sal3.dll, noting that the 
former
does not import anything from the latter?)

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index b169898..9ca4d3a 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Executable_Executable,soffice))
 $(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
 
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
-sal \
 advapi32 \
 shell32 \
 shlwapi \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.mk desktop/Package_manifest.mk desktop/WinResTarget_officeloader.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget

2011-09-19 Thread Jan Holesovsky 
 desktop/Executable_soffice.mk|2 +-
 desktop/Package_manifest.mk  |4 ++--
 desktop/WinResTarget_officeloader.mk |2 +-
 desktop/WinResTarget_sbase.mk|2 +-
 desktop/WinResTarget_scalc.mk|2 +-
 desktop/WinResTarget_sdraw.mk|2 +-
 desktop/WinResTarget_simpress.mk |2 +-
 desktop/WinResTarget_smath.mk|2 +-
 desktop/WinResTarget_soffice.mk  |2 +-
 desktop/WinResTarget_sweb.mk |6 +++---
 desktop/WinResTarget_swriter.mk  |2 +-
 solenv/gbuild/platform/winmingw.mk   |2 ++
 12 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 581c45ba8eae7da1d474317fec3e5af578497a1f
Author: Jan Holesovsky 
Date:   Mon Sep 19 16:53:52 2011 +0200

Make 'desktop' build again with MinGW.

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 02eba09..e82f190 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -32,6 +32,7 @@ $(eval $(call 
gb_Executable_add_precompiled_header,soffice,desktop/inc/pch/preco
 $(eval $(call gb_Executable_set_include,soffice,\
 $$(INCLUDE) \
 -I$(SRCDIR)/desktop/inc/pch \
+-I$(SRCDIR)/desktop/source/inc \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
@@ -59,7 +60,6 @@ endif
 
 $(eval $(call gb_Executable_add_noexception_objects,soffice,\
 desktop/win32/source/extendloaderenvironment \
-desktop/win32/source/soffice/soffice \
 ))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk
index 118edd8..a6a3a72 100644
--- a/desktop/Package_manifest.mk
+++ b/desktop/Package_manifest.mk
@@ -28,9 +28,9 @@ $(eval $(call 
gb_Package_Package,desktop_manifest,$(WORKDIR)/CustomTarget/deskto
 $(eval $(call 
gb_Package_add_customtarget,desktop_manifest,desktop/util,SRCDIR))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\
-bin/soffice.exe \
+$(OUTDIR)/bin/soffice.exe \
 ))
 
-$(eval $(call 
gb_Package_add_file,desktop_manifest,bin/soffice.exe.manifest,soffice.exe.manifest))
+$(eval $(call 
gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.exe.manifest,soffice.exe.manifest))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_officeloader.mk 
b/desktop/WinResTarget_officeloader.mk
index 4c08999..fc72254 100644
--- a/desktop/WinResTarget_officeloader.mk
+++ b/desktop/WinResTarget_officeloader.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,officeloader,\
 sysui/desktop/icons/ooo3_main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,officeloader,util/officeloader.rc))
+$(eval $(call gb_WinResTarget_add_file,officeloader,desktop/util/officeloader))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 5d6589b..b023e25 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,sbase,\
 sysui/desktop/icons/ooo3_base_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,sbase,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,sbase,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 7ed3cb7..4edd697 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,scalc,\
 sysui/desktop/icons/ooo3_calc_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,scalc,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,scalc,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 696a660..1398a1a 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,sdraw,\
 sysui/desktop/icons/ooo3_draw_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,sdraw,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,sdraw,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 5c2ab48..1325f77 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,simpress,\
 sysui/desktop/icons/ooo3_impress_app.ico \
 ))
 
-$(eval $(call 
gb_WinResTarget_add_file,simpress,desktop/win32/source/applauncher/launcher.rc))
+$(eval $(call 
gb_WinResTarget_add_file,simpress,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index 228f53e..95f7516 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@

[Libreoffice-commits] .: desktop/Executable_soffice.mk

2011-09-19 Thread Jan Holesovsky 
 desktop/Executable_soffice.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c2ecd9137d5c2e4d82f32cce582fad393eda9cf5
Author: Jan Holesovsky 
Date:   Mon Sep 19 13:17:01 2011 +0200

Fix endless loop during building soffice.exe deps on Windows.

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index af53510..02eba09 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -40,8 +40,8 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
 ))
 
 $(eval $(call gb_Executable_add_cobjects,soffice,\
-desktop/source/app/copyright_ascii_ooo.c \
-desktop/source/app/main.c \
+desktop/source/app/copyright_ascii_ooo \
+desktop/source/app/main \
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.mk

2011-09-16 Thread Tor Lillqvist 
 desktop/Executable_soffice.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b5cc76fbd51cc0fea3ccf44dd8faacea6bf1c9b5
Author: Tor Lillqvist 
Date:   Fri Sep 16 16:48:40 2011 +0300

Fix typo

diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 3916c40..af53510 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -50,7 +50,7 @@ $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
 
 ifeq ($(COM),MSC)
 
-$(eval $(call gb_Executable_set_ldflags,\
+$(eval $(call gb_Executable_set_ldflags,soffice,\
 $$(LDFLAGS) \
 /STACK:1000 \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits