diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-07-13 14:36:24 +0200 |
| commit | 8b52ada25a24b70b229b026f9f2928326d17443e (patch) | |
| tree | 60c8dab39bfe5414203f49114864c5d4f7273f56 /sd/util | |
| parent | 51608714b37ddc5f4cc9c897b2dac278213feea5 (diff) | |
| parent | 4adb61dc6bb380ff31e145e6a77c92c0b26b42bd (diff) | |
CWS gnumake2: resync to DEV300_m84
Diffstat (limited to 'sd/util')
| -rwxr-xr-x[-rw-r--r--] | sd/util/makefile.mk | 7 | ||||
| -rw-r--r-- | sd/util/sd.map | 8 | ||||
| -rw-r--r-- | sd/util/sdd.map | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/util/sdfilt.map | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sd/util/sdui.map | 2 |
5 files changed, 6 insertions, 21 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 diff --git a/sd/util/sd.map b/sd/util/sd.map deleted file mode 100644 index 59e1057c6daa..000000000000 --- a/sd/util/sd.map +++ /dev/null @@ -1,8 +0,0 @@ -SD_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sd/util/sdd.map b/sd/util/sdd.map deleted file mode 100644 index c7439a13948e..000000000000 --- a/sd/util/sdd.map +++ /dev/null @@ -1,8 +0,0 @@ -SCH_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map index 62213393408d..e38cc1e8c597 100644..100755 --- a/sd/util/sdfilt.map +++ b/sd/util/sdfilt.map @@ -1,4 +1,4 @@ -PPTEXPORTER_1_0 { +UDK_3_0_0 { global: ExportPPT; ImportPPT; diff --git a/sd/util/sdui.map b/sd/util/sdui.map index 51f26bb81cfb..ad5e33836c7c 100644..100755 --- a/sd/util/sdui.map +++ b/sd/util/sdui.map @@ -1,4 +1,4 @@ -CUI_1_0 { +UDK_3_0_0 { global: CreateDialogFactory; local: |