This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new f9aa020536 Addition to my last commit
f9aa020536 is described below
commit f9aa020536cb6da367caaa8d2d668cc6324440a4
Author: mseidel <[email protected]>
AuthorDate: Tue Dec 30 07:58:01 2025 +0100
Addition to my last commit
(cherry picked from commit 018fa46b8d4738ddc0bf41d771ec28d39ceb0a2e)
---
main/desktop/win32/source/guiloader/makefile.mk | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/main/desktop/win32/source/guiloader/makefile.mk
b/main/desktop/win32/source/guiloader/makefile.mk
index 054887b53f..79088d4ba0 100644
--- a/main/desktop/win32/source/guiloader/makefile.mk
+++ b/main/desktop/win32/source/guiloader/makefile.mk
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
PRJ=..$/..$/..
PRJNAME=desktop
@@ -31,17 +29,17 @@ UWINAPILIB=
# --- Settings -----------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
APP1TARGET=guiloader
APP1NOSAL=TRUE
-APP1ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
+APP1ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
APP1OBJS=\
- $(OBJ)$/extendloaderenvironment.obj \
- $(OBJ)$/genericloader.obj \
- $(SOLARLIBDIR)$/pathutils-obj.obj
+ $(OBJ)$/extendloaderenvironment.obj \
+ $(OBJ)$/genericloader.obj \
+ $(SOLARLIBDIR)$/pathutils-obj.obj
STDLIB1=$(SHLWAPILIB)
.IF "$(LINK_SO)"=="TRUE"
@@ -49,13 +47,14 @@ APP2TARGET=so$/guiloader
APP2NOSAL=TRUE
APP2ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
APP2OBJS=\
- $(OBJ)$/extendloaderenvironment.obj \
- $(OBJ)$/genericloader.obj \
- $(SOLARLIBDIR)$/pathutils-obj.obj
+ $(OBJ)$/extendloaderenvironment.obj \
+ $(OBJ)$/genericloader.obj \
+ $(SOLARLIBDIR)$/pathutils-obj.obj
STDLIB2=$(SHLWAPILIB)
.ENDIF # "$(LINK_SO)"=="TRUE"
# --- Targets ------------------------------------------------------
+.INCLUDE : target.mk
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
