summaryrefslogtreecommitdiff
path: root/sd/util/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'sd/util/makefile.mk')
-rwxr-xr-x[-rw-r--r--]sd/util/makefile.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 0bf5b83e2f33..a39e92b1f45f 100644..100755
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -124,7 +124,8 @@ LIB3FILES= \
$(SLB)$/cgm.lib \
$(SLB)$/uitable.lib \
$(SLB)$/uiannotations.lib\
- $(SLB)$/grf.lib
+ $(SLB)$/grf.lib \
+ $(SLB)$/controller.lib
LIB5TARGET=$(SLB)$/sdraw3_2.lib
LIB5FILES= \
@@ -156,7 +157,7 @@ LIB6FILES= \
# sdd
SHL2TARGET= sdd$(DLLPOSTFIX)
SHL2IMPLIB= sddimp
-SHL2VERSIONMAP= sdd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
SHL2DEF=$(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
@@ -229,7 +230,7 @@ SHL4OBJS += $(SLO)$/pchname.obj \
.ENDIF # "$(GUI)$(COM)" == "WNTMSC"
# $(ISDLIB) is build in SHL1TARGET
-.IF "$(GUI)" == "UNX"
+.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
SHL4DEPN=$(SHL1TARGETN)
SHL5DEPN=$(SHL1TARGETN)
.ELSE