diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-18 02:50:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-18 02:50:40 +0300 |
| commit | 67c0847fa953c906a35c410baa64456520d7a6ce (patch) | |
| tree | c956e0b9569bb8e563b8d5878950367805de1f61 /solenv/inc/tg_shl.mk | |
| parent | 7a72d99bdf0b2b82b4fa359398308234a6497766 (diff) | |
MinGW fixes for DLL creation
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index d3720fd2a009..90f09266bbe2 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -296,16 +296,16 @@ $(SHL$(TNR)TARGETN) : \ @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc .ENDIF # "$(use_shl_versions)" != "" - $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL$(TNR)DEFAULTRES) .ENDIF # "$(SHL$(TNR)DEFAULTRES)"!="" .IF "$(SHL$(TNR)ALLRES)"!="" $(COMMAND_ECHO)$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES) .IF "$(COM)"=="GCC" - windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO) + $(WINDRES) $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO) .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL$(TNR)ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ + @echo $(DLLTOOL) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs @@ -529,9 +529,7 @@ $(SHL$(TNR)IMPLIBN): \ @echo "Making: " $(@:f) .IF "$(GUI)" == "WNT" .IF "$(COM)"=="GCC" - @echo no ImportLibs on mingw - @-$(RM) $@ - @$(TOUCH) $@ + $(DLLTOOL) --output-lib=$(SHL$(TNR)IMPLIBN) --input-def=$(SHL$(TNR)DEF) .ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" |