diff options
Diffstat (limited to 'jvmfwk/source/makefile.mk')
| -rw-r--r-- | jvmfwk/source/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index d43a31bc6..76ae22de6 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -31,7 +31,7 @@ FRAMEWORKLIB=jvmfwk TARGET = $(FRAMEWORKLIB) ENABLE_EXCEPTIONS = TRUE -.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" +.IF "$(OS)" != "WNT" UNIXVERSIONNAMES = UDK .ENDIF # WNT @@ -58,7 +58,11 @@ SHL1TARGET = $(FRAMEWORKLIB) .ENDIF # UNIXVERSIONNAMES SHL1DEPN= +.IF "$(COM)" == "MSC" SHL1IMPLIB = i$(FRAMEWORKLIB) +.ELSE +SHL1IMPLIB = $(FRAMEWORKLIB) +.ENDIF SHL1LIBS = $(SLB)$/$(TARGET).lib SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB) SHL1RPATH = URELIB @@ -73,7 +77,7 @@ DEF1NAME = $(SHL1TARGET) .IF "$(GUI)"=="UNX" RCFILE=$(BIN)$/jvmfwk3rc -.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ELIF "$(GUI)"=="WNT" RCFILE=$(BIN)$/jvmfwk3.ini .END |