diff options
| -rw-r--r-- | desktop/Executable_soffice.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_manifest.mk | 4 | ||||
| -rw-r--r-- | desktop/WinResTarget_officeloader.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_sbase.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_scalc.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_sdraw.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_simpress.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_smath.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_soffice.mk | 2 | ||||
| -rw-r--r-- | desktop/WinResTarget_sweb.mk | 6 | ||||
| -rw-r--r-- | desktop/WinResTarget_swriter.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 2 |
12 files changed, 16 insertions, 14 deletions
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 02eba0988851..e82f190428c2 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 118edd8ff6ed..a6a3a7296e96 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 4c089995e257..fc72254c132e 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 5d6589bf5612..b023e25fe3aa 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 7ed3cb748220..4edd6975c581 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 696a660b651a..1398a1a31c14 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 5c2ab48a6280..1325f77b38b3 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 228f53eeb68b..95f7516853c3 100644 --- a/desktop/WinResTarget_smath.mk +++ b/desktop/WinResTarget_smath.mk @@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,smath,\ sysui/desktop/icons/ooo3_math_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,smath,desktop/win32/source/applauncher/launcher.rc)) +$(eval $(call gb_WinResTarget_add_file,smath,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index dc8f145d2f5b..ba3c3d8108d8 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice,\ sysui/desktop/icons/ooo3_main_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,soffice,util/officeloader.rc)) +$(eval $(call gb_WinResTarget_add_file,soffice,desktop/util/officeloader)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk index 2f20df4ae89c..86c12bc6e737 100644 --- a/desktop/WinResTarget_sweb.mk +++ b/desktop/WinResTarget_sweb.mk @@ -33,14 +33,14 @@ $(eval $(call gb_WinResTarget_set_include,sweb,\ $(eval $(call gb_WinResTarget_set_defs,sweb,\ $$(DEFS) \ -DRES_APP_NAME=sweb \ - -DRES_APP_ICON=icons/ooo3_web_app.ico \ + -DRES_APP_ICON=icons/ooo3_writer_app.ico \ -DVERVARIANT=$(BUILD) \ )) $(eval $(call gb_WinResTarget_add_dependency,sweb,\ - sysui/desktop/icons/ooo3_web_app.ico \ + sysui/desktop/icons/ooo3_writer_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,sweb,desktop/win32/source/applauncher/launcher.rc)) +$(eval $(call gb_WinResTarget_add_file,sweb,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk index c19268cf2e1a..6180c40ed572 100644 --- a/desktop/WinResTarget_swriter.mk +++ b/desktop/WinResTarget_swriter.mk @@ -41,6 +41,6 @@ $(eval $(call gb_WinResTarget_add_dependency,swriter,\ sysui/desktop/icons/ooo3_writer_app.ico \ )) -$(eval $(call gb_WinResTarget_add_file,swriter,desktop/win32/source/applauncher/launcher.rc)) +$(eval $(call gb_WinResTarget_add_file,swriter,desktop/win32/source/applauncher/launcher)) # vim: set ts=4 sw=4 et: diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index 18d71bdd4b73..e447752a8d0a 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -436,6 +436,7 @@ gb_Library_PLAINLIBS_NONE += \ mingw32 \ mingwex \ advapi32 \ + comdlg32 \ crypt32 \ d3d9 \ d3dx \ @@ -445,6 +446,7 @@ gb_Library_PLAINLIBS_NONE += \ gnu_getopt \ imm32 \ kernel32 \ + msi \ msimg32 \ msvcrt \ msvcprt \ |