diff options
| author | Andre Fischer <af@openoffice.org> | 2010-07-01 18:06:39 +0200 |
|---|---|---|
| committer | Andre Fischer <af@openoffice.org> | 2010-07-01 18:06:39 +0200 |
| commit | df76bfb0695d19d201936df80192108e7ce51b8c (patch) | |
| tree | d44078a9b9c07340ed1a75361916bbe3a9a4b7b9 /sd/util | |
| parent | 4a33a0f64fa420d39d079c3ab31a0c4579dc83b7 (diff) | |
| parent | 4adb61dc6bb380ff31e145e6a77c92c0b26b42bd (diff) | |
renaissance1: merge with DEV300_m84
Diffstat (limited to 'sd/util')
| -rw-r--r-- | sd/util/makefile.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 54406135331d..8cc7bd3345e6 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -125,7 +125,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= \ @@ -230,7 +231,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 |