Skip to content

C
core
Kaydet (Commit) d3b9e9e1 authored tarafından tono's avatar tono
Dosyalara gözat
Seçenekler

i#111956: MinGW port fix: dependency to shared library

üst aa9ff28e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
automation/util/makefile.mk
Dosyayı görüntüle @ d3b9e9e1
...@@ -123,7 +123,11 @@ SHL3STDLIBS+= \ ...@@ -123,7 +123,11 @@ SHL3STDLIBS+= \
SHL3DEF= $(MISC)$/$(SHL3TARGET).def SHL3DEF= $(MISC)$/$(SHL3TARGET).def
SHL3LIBS= $(SLB)$/communi.lib SHL3LIBS= $(SLB)$/communi.lib
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
SHL3DEPN=$(SHL2TARGETN) SHL3DEPN=$(SHL2TARGETN)
.ELSE
SHL3DEPN=$(SHL2IMPLIBN)
.ENDIF
DEF3NAME =$(SHL3TARGET) DEF3NAME =$(SHL3TARGET)
DEF3DEPN = \ DEF3DEPN = \
...@@ -136,7 +140,7 @@ DEF3DES =Communication ...@@ -136,7 +140,7 @@ DEF3DES =Communication
APP1TARGET=testtool APP1TARGET=testtool
.IF "$(GUI)" == "UNX" .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN) APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
.ELSE .ELSE
APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN) APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
...@@ -228,7 +232,7 @@ APP3STDLIBS+= \ ...@@ -228,7 +232,7 @@ APP3STDLIBS+= \
.ENDIF .ENDIF
.ENDIF .ENDIF
# $(AUTOMATIONLIB) is build in SHL1TARGET # $(AUTOMATIONLIB) is build in SHL1TARGET
.IF "$(GUI)"=="UNX" .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
APP3DEPN=$(SHL1TARGETN) APP3DEPN=$(SHL1TARGETN)
.ELSE .ELSE
APP3DEPN=$(SHL1IMPLIBN) APP3DEPN=$(SHL1IMPLIBN)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment