diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-18 03:19:02 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-18 03:19:02 +0300 |
| commit | 95760e349e95f9a7607da0341f43b6528cbc5ff7 (patch) | |
| tree | aa64c07e6fbf89d2ce6c797be14dc63c90cdaec0 /solenv/inc/tg_shl.mk | |
| parent | 67c0847fa953c906a35c410baa64456520d7a6ce (diff) | |
MSVC followup fix for RC command line syntax
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 90f09266bbe2..1ba56e3c3358 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -296,7 +296,13 @@ $(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 $(RCFLAGSOUTRES)$(SHL$(TNR)DEFAULTRES) +.IF "$(RCFLAGSOUTRES)"!="" + # rc, takes separate flag naming output file, source .rc file last + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(RCFLAGSOUTRES)$(SHL$(TNR)DEFAULTRES) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc +.ELSE + # windres, just takes output file last + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc $(SHL$(TNR)DEFAULTRES) +.ENDIF .ENDIF # "$(SHL$(TNR)DEFAULTRES)"!="" .IF "$(SHL$(TNR)ALLRES)"!="" $(COMMAND_ECHO)$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES) |