diff options
-rw-r--r-- | desktop/win32/source/QuickStart/so/makefile.mk | 4 | ||||
-rw-r--r-- | desktop/win32/source/applauncher/makefile.mk | 4 | ||||
-rw-r--r-- | desktop/win32/source/guiloader/makefile.mk | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/desktop/win32/source/QuickStart/so/makefile.mk b/desktop/win32/source/QuickStart/so/makefile.mk index e2845de98f2f..50154c7d50b2 100644 --- a/desktop/win32/source/QuickStart/so/makefile.mk +++ b/desktop/win32/source/QuickStart/so/makefile.mk @@ -41,13 +41,13 @@ UWINAPILIB = # --- Resources ---------------------------------------------------- +.IF "$(LINK_SO)"=="TRUE" + RCFILES=QuickStart.rc INCPRE=.. # --- Files -------------------------------------------------------- -.IF "$(LINK_SO)"=="TRUE" - OBJFILES=$(OBJ)$/QuickStart.obj APP1OBJS=$(OBJFILES) diff --git a/desktop/win32/source/applauncher/makefile.mk b/desktop/win32/source/applauncher/makefile.mk index f0f5743f38a1..d08309bbed24 100644 --- a/desktop/win32/source/applauncher/makefile.mk +++ b/desktop/win32/source/applauncher/makefile.mk @@ -53,6 +53,7 @@ OBJFILES= \ $(OBJ)$/sweb.obj # SO launcher +.IF "$(LINK_SO)"=="TRUE" .IF "$(BUILD_SPECIAL)"!="" APP1DEPN= $(APP1RES) verinfo.rc APP1TARGET=so$/swriter @@ -139,7 +140,8 @@ APP7VERINFO=verinfo.rc APP7PRODUCTDEF+=-DRES_APP_NAME=sweb -.ENDIF # "$(BUILD_SPECIAL)"!="" +.ENDIF # "$(BUILD_SPECIAL)"!="" +.ENDIF # "$(LINK_SO)"=="TRUE" # --- Targets ------------------------------------------------------ diff --git a/desktop/win32/source/guiloader/makefile.mk b/desktop/win32/source/guiloader/makefile.mk index 5bb1c523ff19..4db1416b7b5e 100644 --- a/desktop/win32/source/guiloader/makefile.mk +++ b/desktop/win32/source/guiloader/makefile.mk @@ -48,14 +48,16 @@ APP1OBJS=\ $(SOLARLIBDIR)$/pathutils-obj.obj STDLIB1=$(SHLWAPILIB) +.IF "$(LINK_SO)"=="TRUE" APP2TARGET=so$/guiloader APP2NOSAL=TRUE -APP2ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico +APP2ICON=$(SOLARRESDIR)$/icons/so9-main-app.ico APP2OBJS=\ $(OBJ)$/extendloaderenvironment.obj \ $(OBJ)$/genericloader.obj \ $(SOLARLIBDIR)$/pathutils-obj.obj STDLIB2=$(SHLWAPILIB) +.ENDIF # "$(LINK_SO)"=="TRUE" # --- Targets ------------------------------------------------------ |