[Libreoffice-commits] .: 2 commits - solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Tue May 17 16:50:43 PDT 2011
solenv/inc/_tg_app.mk | 20 ++++-----
solenv/inc/_tg_def.mk | 20 ++++-----
solenv/inc/_tg_shl.mk | 100 +++++++++++++++++++------------------------------
solenv/inc/shlinfo.rc | 36 ++++++++---------
solenv/inc/tg_app.mk | 2
solenv/inc/tg_def.mk | 2
solenv/inc/tg_res.mk | 7 +--
solenv/inc/tg_shl.mk | 10 +---
solenv/inc/version.hrc | 3 -
solenv/inc/wntgcci.mk | 30 +++++++-------
solenv/inc/wntmsc.mk | 3 -
11 files changed, 106 insertions(+), 127 deletions(-)
New commits:
commit 61199145fb3aa009a0e712d97b373d06e997d907
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 18 02:50:40 2011 +0300
MinGW fixes for DLL creation
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
index 959edd2..b92aa20 100644
--- a/solenv/inc/_tg_app.mk
+++ b/solenv/inc/_tg_app.mk
@@ -135,7 +135,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
@echo mingw
.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
@cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP1RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP1RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
@@ -347,7 +347,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
@echo mingw
.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
@cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP2RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP2RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
@@ -559,7 +559,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
@echo mingw
.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
@cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP3RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP3RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
@@ -771,7 +771,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
@echo mingw
.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
@cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP4RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP4RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
@@ -983,7 +983,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
@echo mingw
.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
@cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP5RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP5RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
@@ -1195,7 +1195,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
@echo mingw
.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
@cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP6RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP6RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
@@ -1407,7 +1407,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
@echo mingw
.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
@cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP7RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP7RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
@@ -1619,7 +1619,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
@echo mingw
.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
@cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP8RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP8RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
@@ -1831,7 +1831,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
@echo mingw
.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
@cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP9RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP9RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
@@ -2043,7 +2043,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
@echo mingw
.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != ""
@cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP10RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP10RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
diff --git a/solenv/inc/_tg_def.mk b/solenv/inc/_tg_def.mk
index 488f638..ea9d53e 100644
--- a/solenv/inc/_tg_def.mk
+++ b/solenv/inc/_tg_def.mk
@@ -26,7 +26,7 @@ $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL1OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL1OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -195,7 +195,7 @@ $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL2OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL2OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -364,7 +364,7 @@ $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL3OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL3OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -533,7 +533,7 @@ $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL4OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL4OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -702,7 +702,7 @@ $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL5OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL5OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -871,7 +871,7 @@ $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL6OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL6OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -1040,7 +1040,7 @@ $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL7OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL7OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -1209,7 +1209,7 @@ $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL8OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL8OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -1378,7 +1378,7 @@ $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL9OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL9OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
@@ -1547,7 +1547,7 @@ $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL10OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL10OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 21f2a4f..44bf1c0 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -267,16 +267,16 @@ $(SHL1TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL1DEFAULTRES)
.ENDIF # "$(SHL1DEFAULTRES)"!=""
.IF "$(SHL1ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL1LINKRES) $(SHL1LINKRESO)
+ $(WINDRES) $(SHL1LINKRES) $(SHL1LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL1ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL1TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL1TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd
@noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB1NAME)"!="" # do not have to include objs
@@ -736,16 +736,16 @@ $(SHL2TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL2DEFAULTRES)
.ENDIF # "$(SHL2DEFAULTRES)"!=""
.IF "$(SHL2ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL2LINKRES) $(SHL2LINKRESO)
+ $(WINDRES) $(SHL2LINKRES) $(SHL2LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL2ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL2TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL2TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd
@noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB2NAME)"!="" # do not have to include objs
@@ -1205,16 +1205,16 @@ $(SHL3TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL3DEFAULTRES)
.ENDIF # "$(SHL3DEFAULTRES)"!=""
.IF "$(SHL3ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL3LINKRES) $(SHL3LINKRESO)
+ $(WINDRES) $(SHL3LINKRES) $(SHL3LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL3ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL3TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL3TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd
@noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB3NAME)"!="" # do not have to include objs
@@ -1674,16 +1674,16 @@ $(SHL4TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL4DEFAULTRES)
.ENDIF # "$(SHL4DEFAULTRES)"!=""
.IF "$(SHL4ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL4LINKRES) $(SHL4LINKRESO)
+ $(WINDRES) $(SHL4LINKRES) $(SHL4LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL4ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL4TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL4TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd
@noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB4NAME)"!="" # do not have to include objs
@@ -2143,16 +2143,16 @@ $(SHL5TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL5DEFAULTRES)
.ENDIF # "$(SHL5DEFAULTRES)"!=""
.IF "$(SHL5ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL5LINKRES) $(SHL5LINKRESO)
+ $(WINDRES) $(SHL5LINKRES) $(SHL5LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL5ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL5TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL5TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd
@noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB5NAME)"!="" # do not have to include objs
@@ -2612,16 +2612,16 @@ $(SHL6TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL6DEFAULTRES)
.ENDIF # "$(SHL6DEFAULTRES)"!=""
.IF "$(SHL6ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL6LINKRES) $(SHL6LINKRESO)
+ $(WINDRES) $(SHL6LINKRES) $(SHL6LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL6ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL6TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL6TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd
@noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB6NAME)"!="" # do not have to include objs
@@ -3081,16 +3081,16 @@ $(SHL7TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL7DEFAULTRES)
.ENDIF # "$(SHL7DEFAULTRES)"!=""
.IF "$(SHL7ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL7LINKRES) $(SHL7LINKRESO)
+ $(WINDRES) $(SHL7LINKRES) $(SHL7LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL7ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL7TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL7TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd
@noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB7NAME)"!="" # do not have to include objs
@@ -3550,16 +3550,16 @@ $(SHL8TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL8DEFAULTRES)
.ENDIF # "$(SHL8DEFAULTRES)"!=""
.IF "$(SHL8ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL8LINKRES) $(SHL8LINKRESO)
+ $(WINDRES) $(SHL8LINKRES) $(SHL8LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL8ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL8TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL8TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd
@noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB8NAME)"!="" # do not have to include objs
@@ -4019,16 +4019,16 @@ $(SHL9TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL9DEFAULTRES)
.ENDIF # "$(SHL9DEFAULTRES)"!=""
.IF "$(SHL9ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL9LINKRES) $(SHL9LINKRESO)
+ $(WINDRES) $(SHL9LINKRES) $(SHL9LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL9ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL9TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL9TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd
@noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB9NAME)"!="" # do not have to include objs
@@ -4488,16 +4488,16 @@ $(SHL10TARGETN) : \
@echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
- $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
+ $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc $(RCFLAGSOUTRES)$(SHL10DEFAULTRES)
.ENDIF # "$(SHL10DEFAULTRES)"!=""
.IF "$(SHL10ALLRES)"!=""
$(COMMAND_ECHO)$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
.IF "$(COM)"=="GCC"
- windres $(SHL10LINKRES) $(SHL10LINKRESO)
+ $(WINDRES) $(SHL10LINKRES) $(SHL10LINKRESO)
.ENDIF # "$(COM)"=="GCC"
.ENDIF # "$(SHL10ALLRES)"!=""
.IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def
- @echo dlltool --dllname $(SHL10TARGET)$(DLLPOST) \
+ @echo $(DLLTOOL) --dllname $(SHL10TARGET)$(DLLPOST) \
--kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd
@noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
.IF "$(DEFLIB10NAME)"!="" # do not have to include objs
@@ -4714,9 +4714,7 @@ $(SHL1IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL1IMPLIBN) --input-def=$(SHL1DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -4761,9 +4759,7 @@ $(SHL2IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL2IMPLIBN) --input-def=$(SHL2DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -4808,9 +4804,7 @@ $(SHL3IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL3IMPLIBN) --input-def=$(SHL3DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -4855,9 +4849,7 @@ $(SHL4IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL4IMPLIBN) --input-def=$(SHL4DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -4902,9 +4894,7 @@ $(SHL5IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL5IMPLIBN) --input-def=$(SHL5DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -4949,9 +4939,7 @@ $(SHL6IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL6IMPLIBN) --input-def=$(SHL6DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -4996,9 +4984,7 @@ $(SHL7IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL7IMPLIBN) --input-def=$(SHL7DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -5043,9 +5029,7 @@ $(SHL8IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL8IMPLIBN) --input-def=$(SHL8DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -5090,9 +5074,7 @@ $(SHL9IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL9IMPLIBN) --input-def=$(SHL9DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
@@ -5137,9 +5119,7 @@ $(SHL10IMPLIBN): \
@echo "Making: " $(@:f)
.IF "$(GUI)" == "WNT"
.IF "$(COM)"=="GCC"
- @echo no ImportLibs on mingw
- @-$(RM) $@
- @$(TOUCH) $@
+ $(DLLTOOL) --output-lib=$(SHL10IMPLIBN) --input-def=$(SHL10DEF)
.ELSE # "$(COM)=="GCC"
# bei use_deffile implib von linker erstellt
.IF "$(USE_DEFFILE)"==""
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 1133bc3..fc1d724 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -164,7 +164,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
@echo mingw
.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != ""
@cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)/$(@:b)_all.res
- windres $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
+ $(WINDRES) $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
.ENDIF
@echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
$(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index c2056a6..763ad26 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -55,7 +55,7 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
$(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
# Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
# Extract RTTI symbols from all the objects that will be used to build a shared library
- $(COMMAND_ECHO)nm -gP $(SHL$(TNR)OBJS) \
+ $(COMMAND_ECHO)$(NM) -gP $(SHL$(TNR)OBJS) \
`$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
| $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
# overwrite the map file generate into the local output tree with the generated
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
index cad4053..61863be 100644
--- a/solenv/inc/tg_res.mk
+++ b/solenv/inc/tg_res.mk
@@ -32,12 +32,11 @@ $(RCTARGET): $(RCFILES) \
@echo "Making: " $(@:f)
.IF "$(CCNUMVER)" > "001300000000"
.IF "$(MFC_INCLUDE)"!=""
- $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
+ $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS) $(RCFLAGSOUTRES)$@
.ELSE
- $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
+ $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS) $(RCFLAGSOUTRES)$@
.ENDIF
.ELSE
- $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
+ $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS) $(RCFLAGSOUTRES)$@
.ENDIF
.ENDIF
-
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index d3720fd..90f0926 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)"==""
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 344abbe..74dd722 100755
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -61,5 +61,4 @@ VS_VERSION_INFO rcdata
{
0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-};
-
+}
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 4db01f5..b0cdddd 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -42,6 +42,10 @@ ARCH_FLAGS*=-march=pentium
CC*=i686-w64-mingw32-gcc
CXX*=i686-w64-mingw32-g++
+NM*=i686-w64-mingw32-nm
+AR*=i686-w64-mingw32-ar
+WINDRES*=i686-w64-mingw32-windres -v
+DLLTOOL*=i686-w64-mingw32-dlltool
CFLAGS+=-fmessage-length=0 -c
@@ -106,18 +110,18 @@ LINK*=$(CXX)
LINKC*=$(CC)
CYGLIB=$(LIB:s/;/ -L/)
-LINKFLAGS=-nostdlib -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB)
+LINKFLAGS= -Wl,--enable-stdcall-fixup,--enable-runtime-pseudo-reloc-v2 -L$(CYGLIB)
.IF "$(USE_MINGW)"=="cygwin"
MINGWLIBDIR=$(COMPATH)$/lib$/mingw
.ELSE
MINGWLIBDIR=$(COMPATH)$/lib
.ENDIF
-MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o
-MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o
-LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o
-LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o
-LINKFLAGSSHLCUI=--warn-once -mconsole -shared $(MINGWLIBDIR)$/dllcrt2.o
+MINGWSSTDOBJ=
+MINGWSSTDENDOBJ=
+LINKFLAGSAPPGUI=-mwindows
+LINKFLAGSSHLGUI=--warn-once -mwindows -shared
+LINKFLAGSAPPCUI=-mconsole
+LINKFLAGSSHLCUI=--warn-once -mconsole -shared
LINKFLAGSTACK=
LINKFLAGSPROF=
LINKFLAGSDEBUG=-g
@@ -160,17 +164,15 @@ STDLIBCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l
STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
-LIBMGR=ar
+LIBMGR=$(AR)
LIBFLAGS=-rsu
-IMPLIB=ld
-IMPLIBFLAGS=
-
-MAPSYM=tmapsym
+MAPSYM=
MAPSYMFLAGS=
-RC=rc
-RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -fo$@ $(RCFILES)
+RC=$(WINDRES)
+RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 $(RCFILES)
+RCFLAGSOUTRES=
RCLINK=
RCLINKFLAGS=
RCSETVERSION=
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 7811d13..adf8bbf 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -338,7 +338,8 @@ MAPSYM=
MAPSYMFLAGS=
RC=rc
-RCFLAGS=-r -DWIN32 -fo$@ $(RCFILES)
+RCFLAGS=-r -DWIN32 $(RCFILES)
+RCFLAGSOUTRES=-fo
RCLINK=rc
RCLINKFLAGS=
RCSETVERSION=
commit 0a7e7602db173ca49243ccef224e5c91d57dc3c3
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed May 18 02:49:34 2011 +0300
Be pickier with syntax for windres
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index be5a3bb..5896f2b 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -34,16 +34,16 @@
// version information
// -----------------------------------------------------------------------
-VS_VERSION_INFO versioninfo
+VS_VERSION_INFO VERSIONINFO
#ifndef SUBVERSION
- fileversion VERSION, 0, VERVARIANT, VER_COUNT
- productversion VERSION, 0, VERVARIANT, VER_COUNT
+ FILEVERSION VERSION, 0, VERVARIANT, VER_COUNT
+ PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
#else
- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
#endif
- fileflagsmask 0x3F
- fileflags
+ FILEFLAGSMASK 0x3F
+ FILEFLAGS
#if defined(DEBUG)
VS_FF_DEBUG |
#endif
@@ -51,27 +51,27 @@ VS_VERSION_INFO versioninfo
VS_FF_PRERELEASE |
#endif
0
- fileos VOS_NT_WINDOWS32
- filetype VFT_APP
+ FILEOS VOS_NT_WINDOWS32
+ FILETYPE VFT_APP
{
- block "StringFileInfo"
+ BLOCK "StringFileInfo"
{
- block "040904E4"
+ BLOCK "040904E4"
{
// International StringTable
- value "CompanyName", "The Document Foundation\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", PPS(ORG_NAME) "\0"
- value "InternalName", PPS(INTERNAL_NAME) "\0"
- value "LegalCopyright", S_CRIGHT " The Document Foundation\0"
+ VALUE "CompanyName", "The Document Foundation\0"
+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
+ VALUE "OriginalFilename", PPS(ORG_NAME) "\0"
+ VALUE "InternalName", PPS(INTERNAL_NAME) "\0"
+ VALUE "LegalCopyright", S_CRIGHT " The Document Foundation\0"
ADDITIONAL_VERINFO1
ADDITIONAL_VERINFO2
ADDITIONAL_VERINFO3
}
}
- block "VarFileInfo"
+ BLOCK "VarFileInfo"
{
- value "Translation", 0x0409, 1252
+ VALUE "Translation", 0x0409, 1252
}
}
More information about the Libreoffice-commits
mailing list