diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:24:24 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 11:24:24 +0000 |
| commit | 24f513d6da7efe2886ed1ae895d01243144f7569 (patch) | |
| tree | 4523e789fdaf2cde55d35baf39a938efeaf9c972 /dmake/win95 | |
| parent | eb35ffba54f7d9d9de5a95cb8af9ca44c05a0d51 (diff) | |
INTEGRATION: CWS dmake43p01 (1.1.1.1.132); FILE MERGED
2005/04/07 22:30:57 vq 1.1.1.1.132.1: Issue number: 43241
Submitted by: shay@openoffice.org
Allow dmake to be build on windows without 4NT.
Diffstat (limited to 'dmake/win95')
| -rw-r--r-- | dmake/win95/microsft/config.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dmake/win95/microsft/config.mk b/dmake/win95/microsft/config.mk index 352eed716d2f..4ac01cc87601 100644 --- a/dmake/win95/microsft/config.mk +++ b/dmake/win95/microsft/config.mk @@ -14,7 +14,7 @@ TMPDIR := # Definition of macros for library, and C startup code. # The following sources are required for MSC -OSR_SRC += tempnam.c ruletab.c +OSR_SRC += ruletab.c DOS_SRC += runargv.c rmprq.c .SETDIR=$(osrdir) : $(OSR_SRC) @@ -27,13 +27,14 @@ SET_STACK = /stack:4096 ASFLAGS += -t -mx $(S_$(MODEL)) # Microsoft C doesn't need tail but needs head +LDOBJS != $(CSTARTUP) $(OBJDIR)/{$(<:f)} LDTAIL != LDHEAD != $(LDFLAGS) LDARGS != $(LDHEAD) -out:$(TARGET) @$(LDTMPOBJ) $(LDTAIL) LDTAIL != $(_libs) _libs != $(!null,$(LDLIBS) ,@$(LDTMPLIB)) -LDTMPOBJ != $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\\,:t"\n")\n) -LDTMPLIB != $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\\,:t"\n")\n) +LDTMPOBJ != $(mktmp,,$(DIVFILE) $(LDOBJS:s,/,\,:t"\n")) +LDTMPLIB != $(mktmp,,$(DIVFILE) $(LDLIBS:s,/,\,:t"\n")) # Debugging libraries and flags DB_LDFLAGS += /nologo /co /li /map |