--- solenv/inc/rules.mk.orig 2003-04-30 02:34:18.000000000 +0900 +++ solenv/inc/rules.mk 2003-12-21 10:35:48.000000000 +0900 @@ -74,7 +74,7 @@ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) @+$(ECHONL) .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$*.cxx .ELSE $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) .ENDIF @@ -92,7 +92,7 @@ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) @+$(ECHONL) .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp + $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$*.cpp .ELSE $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) .ENDIF @@ -114,7 +114,11 @@ @+-$(RM) $@ >& nul @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) @+$(ECHONL) +.IF "$(COM)"=="GCC" + $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$*.cxx +.ELSE $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) +.ENDIF .ENDIF # "$(GUI)"=="UNX" $(SLO)$/%.obj : %.cpp @@ -132,8 +136,12 @@ @+-$(RM) $@ >& nul @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) @+$(ECHONL) +.IF "$(COM)"=="GCC" + $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp +.ELSE $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cpp ) .ENDIF +.ENDIF $(SLO)$/%.obj : $(MISC)$/%.cxx @echo ------------------------------ @@ -149,8 +157,12 @@ .ELSE @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) @+$(ECHONL) +.IF "$(COM)"=="GCC" + $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx +.ELSE $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) .ENDIF +.ENDIF $(OBJ)$/%.obj : $(MISC)$/%.cxx @echo ------------------------------ @@ -166,8 +178,12 @@ .ELSE @+$(TYPE) $(mktmp $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) @+$(ECHONL) +.IF "$(COM)"=="GCC" + $(CXX) $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx +.ELSE $(CXX) @$(mktmp $(CFLAGS) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(PCHSLOFLAGSU) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)$/$*.obj $(CFLAGSINCXX)$(MISC)$/$*.cxx ) .ENDIF +.ENDIF $(OBJ)$/%.obj : %.c @echo ------------------------------ @@ -184,7 +200,7 @@ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) @+$(ECHONL) .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c + $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c .ELSE +-@echo Cflags: $(CFLAGS) $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) @@ -202,7 +218,11 @@ @+-$(RM) $@ >& nul @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) @+$(ECHONL) - $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) +.IF "$(COM)"=="GCC" + $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISCX)$/$*.c +.ELSE + $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $(MISCX)$/$*.c ) +.ENDIF .ENDIF $(SLO)$/%.obj : $(MISCX)$/%.c @@ -217,9 +237,9 @@ @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) @+$(ECHONL) .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c + $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISCX)$/$*.c .ELSE - $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) + $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSSLO) $(PCHSLOFLAGSU) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)\$*.obj $(MISCX)$/$*.c ) .ENDIF .ENDIF @@ -233,9 +253,9 @@ .ELSE @+-$(RM) $@ >& nul .IF "$(COM)"=="GCC" - $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c + $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c .ELSE - $(CXX) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) + $(CC) @$(mktmp $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(PCHSLOFLAGSU) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$*.obj $*.c ) .ENDIF .ENDIF @@ -625,7 +645,7 @@ .SOURCE.idl : . $(SOLARVER)$/$(INPATH)$/idl$/remote $(SOLARVER)$/$(INPATH)$/idl $(SOLARVER)$/$(INPATH)$/idl$(UPDMINOREXT)$/$(PACKAGE) $(OUT)$/ucr$/$(IDLPACKAGE)$/%.urd : %.idl - +$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $< ) + +$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucr$/$(IDLPACKAGE) $< ) $(OUT)$/ucrdoc$/$(IDLPACKAGE)$/%.urd : %.idl +$(IDLC) @$(mktmp $(UNOIDLDEFS) $(TF_PACKAGES_DEF) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $< ) --- solenv/inc/_tg_app.mk.orig 2003-08-15 21:06:14.000000000 +0900 +++ solenv/inc/_tg_app.mk 2004-01-17 23:44:24.000000000 +0900 @@ -18,6 +18,14 @@ .ENDIF .ENDIF +APP1RESO= +.IF "$(GUI)" != "WNT" || "$(COM)" != "GCC" +.ELSE +.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != "" +APP1RESO=$(MISC)$/$(APP1TARGET)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP1DEF=$(APP1DEF) .ELSE @@ -124,7 +132,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP1ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP1ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP1ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP1LINKRES:b).rc .ENDIF .IF "$(APP1VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP1LINKRES:b).rc @@ -133,6 +141,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP1LINKRES:b).rc .ENDIF # "$(APP1LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != "" + @cat $(APP1LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP1RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP1RESO) \ + `$(TYPE) /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP1LIBSALCPPRT) -dynamic $(APP1STDLIBS) -static $(STDLIB) $(STDLIB1) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -169,6 +192,7 @@ +if exist $(MISC)\$(APP1TARGET).lst type $(MISC)\$(APP1TARGET).lst >> $(MISC)\$(APP1TARGET).lnk $(LINK) @$(MISC)\$(APP1TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP1TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -338,7 +362,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP2ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP2ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP2ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP2LINKRES:b).rc .ENDIF .IF "$(APP2VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP2LINKRES:b).rc @@ -347,6 +371,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP2LINKRES:b).rc .ENDIF # "$(APP2LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != "" + @cat $(APP2LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP2RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP2RESO) \ + `$(TYPE) /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(STDLIB) $(STDLIB2) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -383,6 +422,7 @@ +if exist $(MISC)\$(APP2TARGET).lst type $(MISC)\$(APP2TARGET).lst >> $(MISC)\$(APP2TARGET).lnk $(LINK) @$(MISC)\$(APP2TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP2TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -552,7 +592,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP3ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP3ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP3ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP3LINKRES:b).rc .ENDIF .IF "$(APP3VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP3LINKRES:b).rc @@ -561,6 +601,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP3LINKRES:b).rc .ENDIF # "$(APP3LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != "" + @cat $(APP3LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP3RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP3RESO) \ + `$(TYPE) /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(STDLIB) $(STDLIB3) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -597,6 +652,7 @@ +if exist $(MISC)\$(APP3TARGET).lst type $(MISC)\$(APP3TARGET).lst >> $(MISC)\$(APP3TARGET).lnk $(LINK) @$(MISC)\$(APP3TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP3TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -766,7 +822,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP4ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP4ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP4ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP4LINKRES:b).rc .ENDIF .IF "$(APP4VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP4LINKRES:b).rc @@ -775,6 +831,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP4LINKRES:b).rc .ENDIF # "$(APP4LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != "" + @cat $(APP4LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP4RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP4RESO) \ + `$(TYPE) /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(STDLIB) $(STDLIB4) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -811,6 +882,7 @@ +if exist $(MISC)\$(APP4TARGET).lst type $(MISC)\$(APP4TARGET).lst >> $(MISC)\$(APP4TARGET).lnk $(LINK) @$(MISC)\$(APP4TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP4TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -980,7 +1052,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP5ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP5ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP5ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP5LINKRES:b).rc .ENDIF .IF "$(APP5VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP5LINKRES:b).rc @@ -989,6 +1061,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP5LINKRES:b).rc .ENDIF # "$(APP5LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != "" + @cat $(APP5LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP5RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP5RESO) \ + `$(TYPE) /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(STDLIB) $(STDLIB5) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -1025,6 +1112,7 @@ +if exist $(MISC)\$(APP5TARGET).lst type $(MISC)\$(APP5TARGET).lst >> $(MISC)\$(APP5TARGET).lnk $(LINK) @$(MISC)\$(APP5TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP5TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -1194,7 +1282,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP6ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP6ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP6ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP6LINKRES:b).rc .ENDIF .IF "$(APP6VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP6LINKRES:b).rc @@ -1203,6 +1291,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP6LINKRES:b).rc .ENDIF # "$(APP6LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != "" + @cat $(APP6LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP6RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP6RESO) \ + `$(TYPE) /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(STDLIB) $(STDLIB6) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -1239,6 +1342,7 @@ +if exist $(MISC)\$(APP6TARGET).lst type $(MISC)\$(APP6TARGET).lst >> $(MISC)\$(APP6TARGET).lnk $(LINK) @$(MISC)\$(APP6TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP6TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -1408,7 +1512,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP7ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP7ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP7ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP7LINKRES:b).rc .ENDIF .IF "$(APP7VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP7LINKRES:b).rc @@ -1417,6 +1521,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP7LINKRES:b).rc .ENDIF # "$(APP7LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != "" + @cat $(APP7LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP7RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP7RESO) \ + `$(TYPE) /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(STDLIB) $(STDLIB7) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -1453,6 +1572,7 @@ +if exist $(MISC)\$(APP7TARGET).lst type $(MISC)\$(APP7TARGET).lst >> $(MISC)\$(APP7TARGET).lnk $(LINK) @$(MISC)\$(APP7TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP7TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -1622,7 +1742,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP8ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP8ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP8ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP8LINKRES:b).rc .ENDIF .IF "$(APP8VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP8LINKRES:b).rc @@ -1631,6 +1751,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP8LINKRES:b).rc .ENDIF # "$(APP8LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != "" + @cat $(APP8LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP8RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP8RESO) \ + `$(TYPE) /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(STDLIB) $(STDLIB8) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -1667,6 +1802,7 @@ +if exist $(MISC)\$(APP8TARGET).lst type $(MISC)\$(APP8TARGET).lst >> $(MISC)\$(APP8TARGET).lnk $(LINK) @$(MISC)\$(APP8TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP8TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -1836,7 +1972,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP9ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP9ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP9ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP9LINKRES:b).rc .ENDIF .IF "$(APP9VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP9LINKRES:b).rc @@ -1845,6 +1981,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP9LINKRES:b).rc .ENDIF # "$(APP9LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != "" + @cat $(APP9LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP9RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP9RESO) \ + `$(TYPE) /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(STDLIB) $(STDLIB9) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -1881,6 +2032,7 @@ +if exist $(MISC)\$(APP9TARGET).lst type $(MISC)\$(APP9TARGET).lst >> $(MISC)\$(APP9TARGET).lnk $(LINK) @$(MISC)\$(APP9TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP9TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" @@ -2050,7 +2202,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP10ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP10ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP10ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP10LINKRES:b).rc .ENDIF .IF "$(APP10VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP10LINKRES:b).rc @@ -2059,6 +2211,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP10LINKRES:b).rc .ENDIF # "$(APP10LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+echo mingw +.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != "" + @cat $(APP10LINKRES) $(subst,$/res$/,$/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)$/$(@:b)_all.RES + windres $(MISC)$/$(@:b)_all.RES $(APP10RESO) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP10RESO) \ + `$(TYPE) /dev/null $(APP10LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(STDLIB) $(STDLIB10) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -2095,6 +2262,7 @@ +if exist $(MISC)\$(APP10TARGET).lst type $(MISC)\$(APP10TARGET).lst >> $(MISC)\$(APP10TARGET).lnk $(LINK) @$(MISC)\$(APP10TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP10TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" --- solenv/inc/wnt.mk.orig 2003-08-15 21:07:36.000000000 +0900 +++ solenv/inc/wnt.mk 2004-01-12 02:07:20.000000000 +0900 @@ -88,10 +88,14 @@ # --- Set Wrapper command --- .IF "$(GUI)"=="WNT" .IF "$(USE_SHELL)"!= "4nt" -.IF "$(COM)" == "MSC" || "$(COM)" == "GCC" +.IF "$(COM)" == "MSC" #Fallback, normaly set by winenv.* WRAPCMD*=guw.pl .ENDIF +.IF "$(COM)" == "GCC" +#Fallback, normaly set by winenv.* +WRAPCMD*=gum.pl +.ENDIF .ENDIF .ENDIF @@ -164,7 +168,7 @@ #.ENDIF #.IF"$(bndchk)"=="" -.IF "$(COMEX)"=="8" +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" CFLAGS+=-Zm500 -wd4290 -wd4786 -wd4800 .ENDIF #.ENDIF @@ -263,11 +267,11 @@ CFLAGSOPT=-Ox -Oy- CFLAGSNOOPT=-Od CFLAGSOUTOBJ=-Fo -.IF "$(COMEX)"=="8" +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" CFLAGSWALL=-Wall -wd4294 -wd4640 -.ELSE # "$(COMEX)"=="8" +.ELSE # "$(COMEX)"=="8" || "$(COMEX)"=="10" CFLAGSWALL=-W4 -.ENDIF # "$(COMEX)"=="8" +.ENDIF # "$(COMEX)"=="8" || "$(COMEX)"=="10" CFLAGSDFLTWARN=-W3 .IF "$(syntax)"!="" @@ -295,7 +299,7 @@ CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400 CDEFS+=-D_MT .ENDIF -.IF "$(COMEX)"=="8" +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" #CDEFS+=-D__STL_NO_NEW_IOSTREAMS -DSTLPORT_VERSION=450 -D__STL_USE_ABBREVS CDEFS+=-DSTLPORT_VERSION=400 -DWINVER=0x400 -D_WIN32_IE=0x400 CDEFS+=-D_MT @@ -366,12 +370,12 @@ .IF "$(DYNAMIC_CRT)"!="" LIBCMT=msvcrt.lib -LIBCIMT=msvcirt.lib +#LIBCIMT=msvcirt.lib OLDNAMES=oldnames.lib UWINAPILIB*=uwinapi.lib .ELSE LIBCMT=libcmt.lib -LIBCIMT=libcimt.lib +#LIBCIMT=libcimt.lib OLDNAMES=oldnames.lib UWINAPILIB*=uwinapi.lib .ENDIF @@ -401,14 +405,14 @@ STDSHLCUIMT=$(LIBCMT) $(UWINAPILIB) kernel32.lib user32.lib $(OLDNAMES) .ENDIF -.IF "$(COMEX)"!="8" -LIBSTLPORT=stlport_vc6.lib -LIBSTLPORTST=stlport_vc6_static.lib -ATL_INCLUDE=$(COMPATH)$/atl$/include -.ELSE +.IF "$(COMEX)"=="8" || "$(COMEX)"=="10" LIBSTLPORT=stlport_vc7.lib LIBSTLPORTST=stlport_vc7_static.lib ATL_INCLUDE=$(COMPATH)$/atlmfc$/include +.ELSE +LIBSTLPORT=stlport_vc6.lib +LIBSTLPORTST=stlport_vc6_static.lib +ATL_INCLUDE=$(COMPATH)$/atl$/include .ENDIF .IF "$(USE_SHELL)"=="4nt" @@ -470,20 +474,28 @@ #CFLAGS=-c -Wall -I$(INCLUDE) $(OLE2DEF) # new: CYGINC=$(INCLUDE:s/-I /-I/:+" ":s/;/ -I/:s/-I //:s/ / /) -CFLAGS=-c -Wall -I$(CYGINC) $(OLE2DEF) +CFLAGS=-fmessage-length=0 -c -Wall -I$(CYGINC) $(OLE2DEF) + +# flags to enable build with symbols; required for crashdump feature +.IF "$(ENABLE_SYMBOLS)"=="SMALL" +CFLAGSENABLESYMBOLS=-g1 +.ELSE +CFLAGSENABLESYMBOLS=-g +.ENDIF + ### -CFLAGS+=-nostdinc -fPIC -CFLAGSCC=-pipe -mpentium -CFLAGSCXX=-pipe -mpentium -fguiding-decls -CFLAGSEXCEPTIONS=-fexceptions +CFLAGS+=-nostdinc +CFLAGSCC=-pipe -march=pentiumpro +CFLAGSCXX=-pipe -march=pentiumpro -fno-for-scope -fpermissive +CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs CFLAGS_NO_EXCEPTIONS=-fno-exceptions -CFLAGSOBJGUIST=-DWIN32 -CFLAGSOBJCUIST=-DWIN32 -CFLAGSOBJGUIMT=-DWIN32 -CFLAGSOBJCUIMT=-DWIN32 -CFLAGSSLOGUIMT=-DWIN32 -fPIC -CFLAGSSLOCUIMT=-DWIN32 -fPIC +CFLAGSOBJGUIST=-DWIN32 -DWINVER=0x0500 -D_DLL +CFLAGSOBJCUIST=-DWIN32 -DWINVER=0x0500 -D_DLL +CFLAGSOBJGUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL +CFLAGSOBJCUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL +CFLAGSSLOGUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL +CFLAGSSLOCUIMT=-DWIN32 -DWINVER=0x0500 -D_MT -D_DLL CFLAGSPROF= CFLAGSDEBUG=-g CFLAGSDBGUTIL= @@ -492,37 +504,50 @@ CFLAGSOUTOBJ=-o #plattform hart setzen CDEFS+=-D_M_IX86 +CDEFS+=-DSTLPORT_VERSION=450 -D_STLP_USE_DYNAMIC_LIB STATIC= -static DYNAMIC= -dynamic LINK*=ld CYGLIB=$(LIB:s/;/ -L/) -LINKFLAGS=-nodefaultlibs -L$(CYGLIB) -LINKFLAGSAPPGUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o -LINKFLAGSSHLGUI=--warn-once -LINKFLAGSAPPCUI=$(COMPATH)$/i386-mingw32$/lib$/crt1.o -LINKFLAGSSHLCUI=--warn-once +LINKFLAGS=-Wl,--enable-runtime-pseudo-reloc -L$(CYGLIB) +LINKFLAGSAPPGUI=-Wl,--enable-stdcall-fixup +LINKFLAGSSHLGUI=-Wl,--enable-stdcall-fixup -shared --warn-once +LINKFLAGSAPPCUI=-Wl,--enable-stdcall-fixup +LINKFLAGSSHLCUI=-Wl,--enable-stdcall-fixup -shared --warn-once LINKFLAGSTACK= LINKFLAGSPROF= LINKFLAGSDEBUG=-g LINKFLAGSOPT= -STDLIBCPP=-lstdc++ +STDLIBCPP=$(STATIC) -lstdc++ $(DYNAMIC) +UWINAPILIB*=$(DYNAMIC) -luwinapi STDOBJVCL=$(L)$/salmain.obj STDOBJGUI= STDSLOGUI= STDOBJCUI= STDSLOCUI= -STDLIBGUIST=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lm -lkernel32 -luser32 -STDLIBCUIST=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lm -lkernel32 -luser32 -STDLIBGUIMT=-dynamic -ldl -lm -lmingw32 -lkernel32 -luser32 -lgcc -lmoldname -STDLIBGUIMT+= -lmsvcrt -lcrtdll -luser32 -STDLIBCUIMT=-lmingw32 -lgcc -lmoldname -dynamic -ldl -lpthread -lm -lkernel32 -luser32 -STDSHLGUIMT=-dynamic -ldl -lm -lkernel32 -luser32 -lmingw32 -lgcc -STDSHLGUIMT+= -lmoldname -lmsvcrt -lcrtdll -luser32 -STDSHLCUIMT=-dynamic -ldl -lm -lkernel32 -luser32 +STDLIBGUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBCUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBGUIMT=$(STATIC) -lmingw32 -lgcc -lstdc++ -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE +STDLIBCUIMT=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE +STDSHLGUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLGUIST+= -lmsvcrt -lcrtdll +STDSHLCUIST=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLCUIST+= -lmsvcrt -lcrtdll +STDSHLGUIMT=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE +STDSHLCUIMT=$(STATIC) -lmingw32 -lgcc -lmoldname $(DYNAMIC) $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd -lpthreadGCE + +LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(STDLIBCPP) +LIBSTLPORTST=$(STATIC) -lstlport_gcc_static $(DYNAMIC) $(STDLIBCPP) + +PWD:=`cygpath -m $(PWD)` LIBMGR=ar LIBFLAGS=-rsu @@ -534,13 +559,28 @@ MAPSYMFLAGS= RC=rc -RCFLAGS=-DWIN32 -fo$@ $(RCFILES) +RCFLAGS=-D__MINGW32__ -DWIN32 -fo$@ $(RCFILES) RCLINK= RCLINKFLAGS= RCSETVERSION= DLLPOSTFIX=gi +IDLC=$(WRAPCMD) idlc +REGMERGE=$(WRAPCMD) regmerge +REGCOMPARE=$(WRAPCMD) regcompare +REGCOMP=$(WRAPCMD) regcomp +CPPUMAKER=$(WRAPCMD) cppumaker +JAVAMAKER=$(WRAPCMD) javamaker +RDBMAKER=$(WRAPCMD) rdbmaker +STARDEP=$(WRAPCMD) javadep +JAVAC=$(WRAPCMD) javac +JAVA=$(WRAPCMD) java +SCPCOMP=$(WRAPCMD) scpcomp +SCPLINK=$(WRAPCMD) scplink +LZIP=$(WRAPCMD) -env lzip +CPPLCC=$(WRAPCMD) cpplcc + .ENDIF .ENDIF # --- Windows-NT Allgemein --- --- solenv/inc/tg_obj.mk.orig 2003-04-29 01:45:14.000000000 +0900 +++ solenv/inc/tg_obj.mk 2003-12-20 10:25:38.000000000 +0900 @@ -68,9 +68,7 @@ @echo Making: $@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" - +$(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) >> $@ - @+$(TYPE) $@ | tr -d ï\n\rï > $@ - @+$(ECHONL) >> $@ + +$(ECHONL) $(foreach,i,$(OBJFILES:f) $(ROBJ)$/$(i)) > $@ .ELSE # "$(COM)"=="GCC" .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) @@ -97,7 +95,7 @@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) - +$(ECHONL) $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i)) >> $@ + +$(ECHONL) $(foreach,i,$(REAL_SVXLIGHTOBJFILES:f) $(ROBJ)$/$(i)) | xargs -n1 > $@ .ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) @@ -119,7 +117,7 @@ .IF "$(GUI)"=="WNT" .IF "$(COM)"=="GCC" # $(LIBMGR) $(LIBFLAGS) $@ $(OBJFILES) - +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) > $@ + +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)$/$(i)) >> $@ .ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) --- solenv/inc/tg_slo.mk.orig 2001-12-10 22:00:32.000000000 +0900 +++ solenv/inc/tg_slo.mk 2003-12-13 13:23:12.000000000 +0900 @@ -73,10 +73,14 @@ @echo Making: $@ # @+$(RM) $@ .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@ +.ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) .ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) +.ENDIF .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" +echo $(foreach,i,$(SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ @@ -101,10 +105,14 @@ @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(foreach,i,$(REAL_SVXLIGHTSLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@ +.ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) .ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) +.ENDIF .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" +echo $(foreach,i,$(REAL_SVXLIGHTSLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ @@ -122,10 +130,14 @@ @echo ------------------------------ @echo Making: $@ .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i)) | xargs -n1 > $@ +.ELSE .IF "$(LIBTARGET)"!="NO" @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/) .ENDIF # "$(LIBTARGET)"!="NO" $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n")) +.ENDIF .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="UNX" +echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)$/$(i:s/.obj/.o/)) | xargs -n1 > $@ --- solenv/inc/_tg_lib.mk.orig 2003-07-17 03:19:28.000000000 +0900 +++ solenv/inc/_tg_lib.mk 2003-12-29 17:33:20.000000000 +0900 @@ -24,7 +24,15 @@ @cat $(MISC)$/$(LIB1ARCHIV:b).cmd @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s\#'^'$(ROUT)\#$(PRJ)$/$(ROUT)\#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd + @+echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd + @cat $(MISC)$/$(LIB1ARCHIV:b).cmd + @+source $(MISC)$/$(LIB1ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB1ARCHIV)" != "" @@ -53,6 +61,10 @@ @+cat /dev/null $(LIB1FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB1FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB1OBJFILES)"!="" @@ -62,6 +74,7 @@ @-$(TYPE) $(foreach,i,$(LIB1FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB1FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB1OBJFILES) @@ -96,9 +109,17 @@ @+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB2ARCHIV:b).cmd - @source $(MISC)$/$(LIB2ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd + @+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd + @cat $(MISC)$/$(LIB2ARCHIV:b).cmd + @+source $(MISC)$/$(LIB2ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB2ARCHIV)" != "" @@ -127,6 +148,10 @@ @+cat /dev/null $(LIB2FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB2FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB2OBJFILES)"!="" @@ -136,6 +161,7 @@ @-$(TYPE) $(foreach,i,$(LIB2FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB2FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB2OBJFILES) @@ -170,9 +196,17 @@ @+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB3ARCHIV:b).cmd - @source $(MISC)$/$(LIB3ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd + @+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd + @cat $(MISC)$/$(LIB3ARCHIV:b).cmd + @+source $(MISC)$/$(LIB3ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB3ARCHIV)" != "" @@ -201,6 +235,10 @@ @+cat /dev/null $(LIB3FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB3FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB3OBJFILES)"!="" @@ -210,6 +248,7 @@ @-$(TYPE) $(foreach,i,$(LIB3FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB3FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB3OBJFILES) @@ -244,9 +283,17 @@ @+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB4ARCHIV:b).cmd - @source $(MISC)$/$(LIB4ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd + @+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd + @cat $(MISC)$/$(LIB4ARCHIV:b).cmd + @+source $(MISC)$/$(LIB4ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB4ARCHIV)" != "" @@ -275,6 +322,10 @@ @+cat /dev/null $(LIB4FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB4FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB4OBJFILES)"!="" @@ -284,6 +335,7 @@ @-$(TYPE) $(foreach,i,$(LIB4FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB4FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB4OBJFILES) @@ -318,9 +370,17 @@ @+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB5ARCHIV:b).cmd - @source $(MISC)$/$(LIB5ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd + @+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd + @cat $(MISC)$/$(LIB5ARCHIV:b).cmd + @+source $(MISC)$/$(LIB5ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB5ARCHIV)" != "" @@ -349,6 +409,10 @@ @+cat /dev/null $(LIB5FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB5FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB5OBJFILES)"!="" @@ -358,6 +422,7 @@ @-$(TYPE) $(foreach,i,$(LIB5FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB5FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB5OBJFILES) @@ -392,9 +457,17 @@ @+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB6ARCHIV:b).cmd - @source $(MISC)$/$(LIB6ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd + @+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd + @cat $(MISC)$/$(LIB6ARCHIV:b).cmd + @+source $(MISC)$/$(LIB6ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB6ARCHIV)" != "" @@ -423,6 +496,10 @@ @+cat /dev/null $(LIB6FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB6FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB6OBJFILES)"!="" @@ -432,6 +509,7 @@ @-$(TYPE) $(foreach,i,$(LIB6FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB6FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB6OBJFILES) @@ -466,9 +544,17 @@ @+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB7ARCHIV:b).cmd - @source $(MISC)$/$(LIB7ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd + @+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd + @cat $(MISC)$/$(LIB7ARCHIV:b).cmd + @+source $(MISC)$/$(LIB7ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB7ARCHIV)" != "" @@ -497,6 +583,10 @@ @+cat /dev/null $(LIB7FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB7FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB7OBJFILES)"!="" @@ -506,6 +596,7 @@ @-$(TYPE) $(foreach,i,$(LIB7FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB7FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB7OBJFILES) @@ -540,9 +631,17 @@ @+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB8ARCHIV:b).cmd - @source $(MISC)$/$(LIB8ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd + @+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd + @cat $(MISC)$/$(LIB8ARCHIV:b).cmd + @+source $(MISC)$/$(LIB8ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB8ARCHIV)" != "" @@ -571,6 +670,10 @@ @+cat /dev/null $(LIB8FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB8FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB8OBJFILES)"!="" @@ -580,6 +683,7 @@ @-$(TYPE) $(foreach,i,$(LIB8FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB8FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB8OBJFILES) @@ -614,9 +718,17 @@ @+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB9ARCHIV:b).cmd - @source $(MISC)$/$(LIB9ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd + @+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd + @cat $(MISC)$/$(LIB9ARCHIV:b).cmd + @+source $(MISC)$/$(LIB9ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB9ARCHIV)" != "" @@ -645,6 +757,10 @@ @+cat /dev/null $(LIB9FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB9FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB9OBJFILES)"!="" @@ -654,6 +770,7 @@ @-$(TYPE) $(foreach,i,$(LIB9FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB9FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB9OBJFILES) @@ -688,9 +805,17 @@ @+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB10ARCHIV:b).cmd - @source $(MISC)$/$(LIB10ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd + @+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd + @cat $(MISC)$/$(LIB10ARCHIV:b).cmd + @+source $(MISC)$/$(LIB10ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB10ARCHIV)" != "" @@ -719,6 +844,10 @@ @+cat /dev/null $(LIB10FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB10FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB10OBJFILES)"!="" @@ -728,6 +857,7 @@ @-$(TYPE) $(foreach,i,$(LIB10FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB10FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB10OBJFILES) --- solenv/inc/_tg_shl.mk.orig 2003-07-17 03:19:40.000000000 +0900 +++ solenv/inc/_tg_shl.mk 2004-01-14 21:00:40.000000000 +0900 @@ -66,7 +66,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL1IMPLIB)" != "" USE_1IMPLIB=-implib:$(LB)$/$(SHL1IMPLIB).lib .ELSE # "$(SHL1IMPLIB)" != "" @@ -75,7 +75,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_1IMPLIB_DEPS=$(LB)$/$(SHL1IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL1DEF=$(SHL1DEF) @@ -175,6 +177,7 @@ SHL1RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL1RES)) SHL1ALLRES+=$(SHL1RES) SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1RES)"!="" .ENDIF @@ -182,6 +185,7 @@ SHL1DEFAULTRES*=$(MISC)$/$(SHL1TARGET)_def.res SHL1ALLRES+=$(SHL1DEFAULTRES) SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL1DESCRIPTION)"=="" @@ -224,7 +228,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -254,17 +258,35 @@ +$(COPY) /b $(SHL1ALLRES:s/res /res+/) $(SHL1LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL1LINKRES) $(SHL1LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL1ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ + `$(TYPE) /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL1STDLIBS) $(STDSHL) $(STDSHL1) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL1ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL1ARCHIV).a --output-exp $(LB)$/lib$(SHL1TARGET).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL1STDLIBS) $(STDSHL) $(STDSHL1) $(SHL1RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ + `$(TYPE) /dev/null $(SHL1LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL1TARGET).exp $(SHL1STDLIBS) $(STDSHL) $(STDSHL1) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -280,7 +302,6 @@ $(STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ @@ -313,6 +334,7 @@ +$(TYPE) $(MISC)$/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL1TARGET).lnk $(LINK) @$(MISC)$/$(SHL1TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -483,7 +505,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL2IMPLIB)" != "" USE_2IMPLIB=-implib:$(LB)$/$(SHL2IMPLIB).lib .ELSE # "$(SHL2IMPLIB)" != "" @@ -492,7 +514,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_2IMPLIB_DEPS=$(LB)$/$(SHL2IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL2DEF=$(SHL2DEF) @@ -592,6 +616,7 @@ SHL2RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL2RES)) SHL2ALLRES+=$(SHL2RES) SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2RES)"!="" .ENDIF @@ -599,6 +624,7 @@ SHL2DEFAULTRES*=$(MISC)$/$(SHL2TARGET)_def.res SHL2ALLRES+=$(SHL2DEFAULTRES) SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL2DESCRIPTION)"=="" @@ -641,7 +667,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -671,17 +697,35 @@ +$(COPY) /b $(SHL2ALLRES:s/res /res+/) $(SHL2LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL2LINKRES) $(SHL2LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL2ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL2STDLIBS) $(STDSHL) $(STDSHL2) $(SHL2RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ + `$(TYPE) /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL2STDLIBS) $(STDSHL) $(STDSHL2) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL2ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL2ARCHIV).a --output-exp $(LB)$/lib$(SHL2TARGET).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ + `$(TYPE) /dev/null $(SHL2LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL2TARGET).exp $(SHL2STDLIBS) $(STDSHL) $(STDSHL2) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -697,7 +741,6 @@ $(STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ @@ -730,6 +773,7 @@ +$(TYPE) $(MISC)$/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL2TARGET).lnk $(LINK) @$(MISC)$/$(SHL2TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -900,7 +944,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL3IMPLIB)" != "" USE_3IMPLIB=-implib:$(LB)$/$(SHL3IMPLIB).lib .ELSE # "$(SHL3IMPLIB)" != "" @@ -909,7 +953,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_3IMPLIB_DEPS=$(LB)$/$(SHL3IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL3DEF=$(SHL3DEF) @@ -1009,6 +1055,7 @@ SHL3RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL3RES)) SHL3ALLRES+=$(SHL3RES) SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3RES)"!="" .ENDIF @@ -1016,6 +1063,7 @@ SHL3DEFAULTRES*=$(MISC)$/$(SHL3TARGET)_def.res SHL3ALLRES+=$(SHL3DEFAULTRES) SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL3DESCRIPTION)"=="" @@ -1058,7 +1106,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL3TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -1088,17 +1136,35 @@ +$(COPY) /b $(SHL3ALLRES:s/res /res+/) $(SHL3LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL3LINKRES) $(SHL3LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL3ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ + `$(TYPE) /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL3STDLIBS) $(STDSHL) $(STDSHL3) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL3ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL3ARCHIV).a --output-exp $(LB)$/lib$(SHL3TARGET).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL3STDLIBS) $(STDSHL) $(STDSHL3) $(SHL3RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ + `$(TYPE) /dev/null $(SHL3LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL3TARGET).exp $(SHL3STDLIBS) $(STDSHL) $(STDSHL3) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -1114,7 +1180,6 @@ $(STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ @@ -1147,6 +1212,7 @@ +$(TYPE) $(MISC)$/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL3TARGET).lnk $(LINK) @$(MISC)$/$(SHL3TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -1317,7 +1383,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL4IMPLIB)" != "" USE_4IMPLIB=-implib:$(LB)$/$(SHL4IMPLIB).lib .ELSE # "$(SHL4IMPLIB)" != "" @@ -1326,7 +1392,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_4IMPLIB_DEPS=$(LB)$/$(SHL4IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL4DEF=$(SHL4DEF) @@ -1426,6 +1494,7 @@ SHL4RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL4RES)) SHL4ALLRES+=$(SHL4RES) SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4RES)"!="" .ENDIF @@ -1433,6 +1502,7 @@ SHL4DEFAULTRES*=$(MISC)$/$(SHL4TARGET)_def.res SHL4ALLRES+=$(SHL4DEFAULTRES) SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL4DESCRIPTION)"=="" @@ -1475,7 +1545,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL4TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -1505,17 +1575,35 @@ +$(COPY) /b $(SHL4ALLRES:s/res /res+/) $(SHL4LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL4LINKRES) $(SHL4LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL4ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL4STDLIBS) $(STDSHL) $(STDSHL4) $(SHL4RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ + `$(TYPE) /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL4STDLIBS) $(STDSHL) $(STDSHL4) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL4ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL4ARCHIV).a --output-exp $(LB)$/lib$(SHL4TARGET).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ + `$(TYPE) /dev/null $(SHL4LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL4TARGET).exp $(SHL4STDLIBS) $(STDSHL) $(STDSHL4) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -1531,7 +1619,6 @@ $(STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ @@ -1564,6 +1651,7 @@ +$(TYPE) $(MISC)$/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL4TARGET).lnk $(LINK) @$(MISC)$/$(SHL4TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -1734,7 +1822,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL5IMPLIB)" != "" USE_5IMPLIB=-implib:$(LB)$/$(SHL5IMPLIB).lib .ELSE # "$(SHL5IMPLIB)" != "" @@ -1743,7 +1831,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_5IMPLIB_DEPS=$(LB)$/$(SHL5IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL5DEF=$(SHL5DEF) @@ -1843,6 +1933,7 @@ SHL5RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL5RES)) SHL5ALLRES+=$(SHL5RES) SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5RES)"!="" .ENDIF @@ -1850,6 +1941,7 @@ SHL5DEFAULTRES*=$(MISC)$/$(SHL5TARGET)_def.res SHL5ALLRES+=$(SHL5DEFAULTRES) SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL5DESCRIPTION)"=="" @@ -1892,7 +1984,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL5TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -1922,17 +2014,35 @@ +$(COPY) /b $(SHL5ALLRES:s/res /res+/) $(SHL5LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL5LINKRES) $(SHL5LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL5ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL5STDLIBS) $(STDSHL) $(STDSHL5) $(SHL5RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ + `$(TYPE) /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL5STDLIBS) $(STDSHL) $(STDSHL5) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL5ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL5ARCHIV).a --output-exp $(LB)$/lib$(SHL5TARGET).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ + `$(TYPE) /dev/null $(SHL5LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL5TARGET).exp $(SHL5STDLIBS) $(STDSHL) $(STDSHL5) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -1948,7 +2058,6 @@ $(STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ @@ -1981,6 +2090,7 @@ +$(TYPE) $(MISC)$/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL5TARGET).lnk $(LINK) @$(MISC)$/$(SHL5TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -2151,7 +2261,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL6IMPLIB)" != "" USE_6IMPLIB=-implib:$(LB)$/$(SHL6IMPLIB).lib .ELSE # "$(SHL6IMPLIB)" != "" @@ -2160,7 +2270,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_6IMPLIB_DEPS=$(LB)$/$(SHL6IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL6DEF=$(SHL6DEF) @@ -2260,6 +2372,7 @@ SHL6RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL6RES)) SHL6ALLRES+=$(SHL6RES) SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6RES)"!="" .ENDIF @@ -2267,6 +2380,7 @@ SHL6DEFAULTRES*=$(MISC)$/$(SHL6TARGET)_def.res SHL6ALLRES+=$(SHL6DEFAULTRES) SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL6DESCRIPTION)"=="" @@ -2309,7 +2423,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL6TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -2339,17 +2453,35 @@ +$(COPY) /b $(SHL6ALLRES:s/res /res+/) $(SHL6LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL6LINKRES) $(SHL6LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL6ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL6STDLIBS) $(STDSHL) $(STDSHL6) $(SHL6RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ + `$(TYPE) /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL6STDLIBS) $(STDSHL) $(STDSHL6) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL6ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL6ARCHIV).a --output-exp $(LB)$/lib$(SHL6TARGET).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ + `$(TYPE) /dev/null $(SHL6LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL6TARGET).exp $(SHL6STDLIBS) $(STDSHL) $(STDSHL6) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -2365,7 +2497,6 @@ $(STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ @@ -2398,6 +2529,7 @@ +$(TYPE) $(MISC)$/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL6TARGET).lnk $(LINK) @$(MISC)$/$(SHL6TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -2568,7 +2700,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL7IMPLIB)" != "" USE_7IMPLIB=-implib:$(LB)$/$(SHL7IMPLIB).lib .ELSE # "$(SHL7IMPLIB)" != "" @@ -2577,7 +2709,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_7IMPLIB_DEPS=$(LB)$/$(SHL7IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL7DEF=$(SHL7DEF) @@ -2677,6 +2811,7 @@ SHL7RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL7RES)) SHL7ALLRES+=$(SHL7RES) SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7RES)"!="" .ENDIF @@ -2684,6 +2819,7 @@ SHL7DEFAULTRES*=$(MISC)$/$(SHL7TARGET)_def.res SHL7ALLRES+=$(SHL7DEFAULTRES) SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL7DESCRIPTION)"=="" @@ -2726,7 +2862,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL7TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -2756,17 +2892,35 @@ +$(COPY) /b $(SHL7ALLRES:s/res /res+/) $(SHL7LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL7LINKRES) $(SHL7LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL7ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ + `$(TYPE) /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL7STDLIBS) $(STDSHL) $(STDSHL7) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL7ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL7ARCHIV).a --output-exp $(LB)$/lib$(SHL7TARGET).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL7STDLIBS) $(STDSHL) $(STDSHL7) $(SHL7RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ + `$(TYPE) /dev/null $(SHL7LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL7TARGET).exp $(SHL7STDLIBS) $(STDSHL) $(STDSHL7) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -2782,7 +2936,6 @@ $(STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ @@ -2815,6 +2968,7 @@ +$(TYPE) $(MISC)$/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL7TARGET).lnk $(LINK) @$(MISC)$/$(SHL7TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -2985,7 +3139,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL8IMPLIB)" != "" USE_8IMPLIB=-implib:$(LB)$/$(SHL8IMPLIB).lib .ELSE # "$(SHL8IMPLIB)" != "" @@ -2994,7 +3148,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_8IMPLIB_DEPS=$(LB)$/$(SHL8IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL8DEF=$(SHL8DEF) @@ -3094,6 +3250,7 @@ SHL8RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL8RES)) SHL8ALLRES+=$(SHL8RES) SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8RES)"!="" .ENDIF @@ -3101,6 +3258,7 @@ SHL8DEFAULTRES*=$(MISC)$/$(SHL8TARGET)_def.res SHL8ALLRES+=$(SHL8DEFAULTRES) SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL8DESCRIPTION)"=="" @@ -3143,7 +3301,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL8TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -3173,17 +3331,35 @@ +$(COPY) /b $(SHL8ALLRES:s/res /res+/) $(SHL8LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL8LINKRES) $(SHL8LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL8ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL8STDLIBS) $(STDSHL) $(STDSHL8) $(SHL8RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ + `$(TYPE) /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL8STDLIBS) $(STDSHL) $(STDSHL8) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL8ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL8ARCHIV).a --output-exp $(LB)$/lib$(SHL8TARGET).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ + `$(TYPE) /dev/null $(SHL8LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL8TARGET).exp $(SHL8STDLIBS) $(STDSHL) $(STDSHL8) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -3199,7 +3375,6 @@ $(STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ @@ -3232,6 +3407,7 @@ +$(TYPE) $(MISC)$/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL8TARGET).lnk $(LINK) @$(MISC)$/$(SHL8TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -3402,7 +3578,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL9IMPLIB)" != "" USE_9IMPLIB=-implib:$(LB)$/$(SHL9IMPLIB).lib .ELSE # "$(SHL9IMPLIB)" != "" @@ -3411,7 +3587,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_9IMPLIB_DEPS=$(LB)$/$(SHL9IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL9DEF=$(SHL9DEF) @@ -3511,6 +3689,7 @@ SHL9RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL9RES)) SHL9ALLRES+=$(SHL9RES) SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9RES)"!="" .ENDIF @@ -3518,6 +3697,7 @@ SHL9DEFAULTRES*=$(MISC)$/$(SHL9TARGET)_def.res SHL9ALLRES+=$(SHL9DEFAULTRES) SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL9DESCRIPTION)"=="" @@ -3560,7 +3740,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL9TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -3590,17 +3770,35 @@ +$(COPY) /b $(SHL9ALLRES:s/res /res+/) $(SHL9LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL9LINKRES) $(SHL9LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL9ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ + `$(TYPE) /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL9STDLIBS) $(STDSHL) $(STDSHL9) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL9ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL9ARCHIV).a --output-exp $(LB)$/lib$(SHL9TARGET).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL9STDLIBS) $(STDSHL) $(STDSHL9) $(SHL9RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ + `$(TYPE) /dev/null $(SHL9LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL9TARGET).exp $(SHL9STDLIBS) $(STDSHL) $(STDSHL9) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -3616,7 +3814,6 @@ $(STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ @@ -3649,6 +3846,7 @@ +$(TYPE) $(MISC)$/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL9TARGET).lnk $(LINK) @$(MISC)$/$(SHL9TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -3819,7 +4017,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL10IMPLIB)" != "" USE_10IMPLIB=-implib:$(LB)$/$(SHL10IMPLIB).lib .ELSE # "$(SHL10IMPLIB)" != "" @@ -3828,7 +4026,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_10IMPLIB_DEPS=$(LB)$/$(SHL10IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL10DEF=$(SHL10DEF) @@ -3928,6 +4128,7 @@ SHL10RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL10RES)) SHL10ALLRES+=$(SHL10RES) SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10RES)"!="" .ENDIF @@ -3935,6 +4136,7 @@ SHL10DEFAULTRES*=$(MISC)$/$(SHL10TARGET)_def.res SHL10ALLRES+=$(SHL10DEFAULTRES) SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL10DESCRIPTION)"=="" @@ -3977,7 +4179,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL10TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -4007,17 +4209,35 @@ +$(COPY) /b $(SHL10ALLRES:s/res /res+/) $(SHL10LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL10LINKRES) $(SHL10LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL10ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ + `$(TYPE) /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL10STDLIBS) $(STDSHL) $(STDSHL10) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL10ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL10ARCHIV).a --output-exp $(LB)$/lib$(SHL10TARGET).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL10STDLIBS) $(STDSHL) $(STDSHL10) $(SHL10RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ + `$(TYPE) /dev/null $(SHL10LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL10TARGET).exp $(SHL10STDLIBS) $(STDSHL) $(STDSHL10) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -4033,7 +4253,6 @@ $(STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ @@ -4066,6 +4285,7 @@ +$(TYPE) $(MISC)$/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL10TARGET).lnk $(LINK) @$(MISC)$/$(SHL10TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -4199,14 +4419,20 @@ @echo ------------------------------ @echo Making: $(SHL1IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL1IMPLIBN) \ -def:$(SHL1DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL1TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4249,14 +4475,20 @@ @echo ------------------------------ @echo Making: $(SHL2IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL2IMPLIBN) \ -def:$(SHL2DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL2TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4299,14 +4531,20 @@ @echo ------------------------------ @echo Making: $(SHL3IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL3IMPLIBN) \ -def:$(SHL3DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL3TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4349,14 +4587,20 @@ @echo ------------------------------ @echo Making: $(SHL4IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL4IMPLIBN) \ -def:$(SHL4DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL4TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4399,14 +4643,20 @@ @echo ------------------------------ @echo Making: $(SHL5IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL5IMPLIBN) \ -def:$(SHL5DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL5TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4449,14 +4699,20 @@ @echo ------------------------------ @echo Making: $(SHL6IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL6IMPLIBN) \ -def:$(SHL6DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL6TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4499,14 +4755,20 @@ @echo ------------------------------ @echo Making: $(SHL7IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL7IMPLIBN) \ -def:$(SHL7DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL7TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4549,14 +4811,20 @@ @echo ------------------------------ @echo Making: $(SHL8IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL8IMPLIBN) \ -def:$(SHL8DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL8TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4599,14 +4867,20 @@ @echo ------------------------------ @echo Making: $(SHL9IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL9IMPLIBN) \ -def:$(SHL9DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL9TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" @@ -4649,6 +4923,11 @@ @echo ------------------------------ @echo Making: $(SHL10IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL10IMPLIBN) \ @@ -4656,6 +4935,7 @@ .ELSE # "$(GUI)" == "WNT" +$(TOUCH) $@ +@echo build of $(SHL10TARGETN) creates $@ +.ENDIF .ENDIF # "$(GUI)" == "WNT" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" --- solenv/inc/tg_shl.mk.orig 2003-07-17 03:20:44.000000000 +0900 +++ solenv/inc/tg_shl.mk 2004-01-14 21:00:38.000000000 +0900 @@ -166,7 +166,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL$(TNR)IMPLIB)" != "" USE_$(TNR)IMPLIB=-implib:$(LB)$/$(SHL$(TNR)IMPLIB).lib .ELSE # "$(SHL$(TNR)IMPLIB)" != "" @@ -175,7 +175,9 @@ .ENDIF # "$(COM)" == "MSC" .IF "$(USE_DEFFILE)"=="" +.IF "$(COM)" != "GCC" USE_$(TNR)IMPLIB_DEPS=$(LB)$/$(SHL$(TNR)IMPLIB).lib +.ENDIF .ENDIF # "$(USE_DEFFILE)"=="" .ENDIF # "$(GUI)" == "WNT" USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF) @@ -275,6 +277,7 @@ SHL$(TNR)RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL$(TNR)RES)) SHL$(TNR)ALLRES+=$(SHL$(TNR)RES) SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res +SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o .ENDIF # "$(SHL$(TNR)RES)"!="" .ENDIF @@ -282,6 +285,7 @@ SHL$(TNR)DEFAULTRES*=$(MISC)$/$(SHL$(TNR)TARGET)_def.res SHL$(TNR)ALLRES+=$(SHL$(TNR)DEFAULTRES) SHL$(TNR)LINKRES*=$(MISC)$/$(SHL$(TNR)TARGET).res +SHL$(TNR)LINKRESO*=$(MISC)$/$(SHL$(TNR)TARGET)_res.o .ENDIF # "$(SHL$(TNR)DEFAULTRES)$(use_shl_versions)"!="" .IF "$(NO_SHL$(TNR)DESCRIPTION)"=="" @@ -324,7 +328,7 @@ .IF "$(GUI)" == "WNT" .IF "$(UPDATER)"=="YES" .IF "$(COM)"=="GCC" - $(CXX) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c + $(CC) -c -o$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) `cygpath -m $(SOLARENV)`$/src$/version.c .ELSE $(CXX) -c -Fo$(SLO)$/{$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL$(TNR)TARGET))}_version.obj -DWNT $(ENVCDEFS) -I$(INCCOM) $(SOLARENV)$/src$/version.c .ENDIF # "$(COM)"=="GCC" @@ -354,17 +358,35 @@ +$(COPY) /b $(SHL$(TNR)ALLRES:s/res /res+/) $(SHL$(TNR)LINKRES) .ELSE # "$(USE_SHELL)"=="4nt" +$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES) +.IF "$(COM)"=="GCC" + windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO) +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(USE_SHELL)"=="4nt" .ENDIF # "$(SHL$(TNR)ALLRES)"!="" -.IF "$(linkinc)"=="" -.IF "$(USE_DEFFILE)"!="" .IF "$(COM)"=="GCC" +.IF "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-exp $(MISC)$/$(@:b).exp @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ - $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) | tr -d ï\r\nï > $(MISC)$/$(@:b).cmd - @+$(TYPE) $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$/$(ROUT)\#g | tr -d ï\r\nï >> $(MISC)$/$(@:b).cmd - @+echo $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) $(SHL$(TNR)RES) >> $(MISC)$/$(@:b).cmd - $(MISC)$/$(@:b).cmd + $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ + `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(MISC)$/$(@:b).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a --output-exp $(LB)$/lib$(SHL$(TNR)TARGET).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ + `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \ + -Wl,$(LB)$/lib$(SHL$(TNR)TARGET).exp $(SHL$(TNR)STDLIBS) $(STDSHL) $(STDSHL$(TNR)) \ + -Wl,-Map,$(MISC)$/$(@:b).map > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd +.ENDIF # "$(USE_DEFFILE)"!="" .ELSE +.IF "$(linkinc)"=="" +.IF "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp \ $(LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -380,7 +402,6 @@ $(STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \ @@ -413,6 +434,7 @@ +$(TYPE) $(MISC)$/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)$/$(SHL$(TNR)TARGET).lnk $(LINK) @$(MISC)$/$(SHL$(TNR)TARGET).lnk .ENDIF # "$(linkinc)"=="" +.ENDIF # "$(COM)"=="GCC" .ENDIF # "$(GUI)" == "WNT" .IF "$(GUI)"=="UNX" .IF "$(UPDATER)"=="YES" @@ -593,14 +615,20 @@ @echo ------------------------------ @echo Making: $(SHL$(TNR)IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # "$(COM)=="GCC" # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL$(TNR)IMPLIBN) \ -def:$(SHL$(TNR)DEF) ) -.ELSE # "$(GUI)" == "WNT" +.ELSE # "$(USE_DEFFILE)=="" +$(TOUCH) $@ +@echo build of $(SHL$(TNR)TARGETN) creates $@ -.ENDIF # "$(GUI)" == "WNT" +.ENDIF # "$(USE_DEFFILE)=="" +.ENDIF # "$(COM)"=="GCC" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" .IF "$(USE_DEFFILE)"=="" --- solenv/inc/target.mk.orig 2003-07-04 00:27:28.000000000 +0900 +++ solenv/inc/target.mk 2003-12-30 19:21:36.000000000 +0900 @@ -910,6 +910,9 @@ .ENDIF .IF "$(SHL1TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL1ARCHIV!:=$(SHL1TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -931,6 +934,9 @@ .ENDIF .IF "$(SHL2TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL2ARCHIV!:=$(SHL2TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -952,6 +958,9 @@ .ENDIF .IF "$(SHL3TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL3ARCHIV!:=$(SHL3TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -973,6 +982,9 @@ .ENDIF .IF "$(SHL4TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL4ARCHIV!:=$(SHL4TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -994,6 +1006,9 @@ .ENDIF .IF "$(SHL5TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL5ARCHIV!:=$(SHL5TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -1015,6 +1030,9 @@ .ENDIF .IF "$(SHL6TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL6ARCHIV!:=$(SHL6TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -1036,6 +1054,9 @@ .ENDIF .IF "$(SHL7TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL7ARCHIV!:=$(SHL7TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -1057,6 +1078,9 @@ .ENDIF .IF "$(SHL8TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL8ARCHIV!:=$(SHL8TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -1078,6 +1102,9 @@ .ENDIF .IF "$(SHL9TARGET)"!="" +.IF "$(GUI)$(COM)"=="WNTGCC" +SHL9ARCHIV!:=$(SHL9TARGET) +.ENDIF .IF "$(WINVERSIONNAMES)"!="" SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR) .ENDIF # "$(WINVERSIONNAMES)"!="" @@ -1429,49 +1456,95 @@ .IF "$(LIB1TARGET)" != "" LIB1 ?= TNR!:=1 LIB1TARGETN=$(LIB1TARGET) +.IF "$(LIB1ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB1ARCHIV!:=$(LB)$/$(LIB1ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB2TARGET)" != "" LIB2 ?= TNR!:=2 LIB2TARGETN=$(LIB2TARGET) +.IF "$(LIB2ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB2ARCHIV!:=$(LB)$/$(LIB2ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB3TARGET)" != "" LIB3 ?= TNR!:=3 LIB3TARGETN=$(LIB3TARGET) +.IF "$(LIB3ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB3ARCHIV!:=$(LB)$/$(LIB3ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB4TARGET)" != "" LIB4 ?= TNR!:=4 LIB4TARGETN=$(LIB4TARGET) +.IF "$(LIB4ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB4ARCHIV!:=$(LB)$/$(LIB4ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB5TARGET)" != "" LIB5 ?= TNR!:=5 LIB5TARGETN=$(LIB5TARGET) +.IF "$(LIB5ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB5ARCHIV!:=$(LB)$/$(LIB5ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB6TARGET)" != "" LIB6 ?= TNR!:=6 LIB6TARGETN=$(LIB6TARGET) +.IF "$(LIB6ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB6ARCHIV!:=$(LB)$/$(LIB6ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB7TARGET)" != "" LIB7 ?= TNR!:=7 LIB7TARGETN=$(LIB7TARGET) +.IF "$(LIB7ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB7ARCHIV!:=$(LB)$/$(LIB7ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB8TARGET)" != "" LIB8 ?= TNR!:=8 LIB8TARGETN=$(LIB8TARGET) +.IF "$(LIB8ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB8ARCHIV!:=$(LB)$/$(LIB8ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB9TARGET)" != "" LIB9 ?= TNR!:=9 LIB9TARGETN=$(LIB9TARGET) +.IF "$(LIB9ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB9ARCHIV!:=$(LB)$/$(LIB9ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(GUI)"=="WNT" +.IF "$(COM)"!="GCC" LIB1ARCHIV= LIB2ARCHIV= LIB3ARCHIV= @@ -1481,6 +1554,7 @@ LIB7ARCHIV= LIB8ARCHIV= LIB9ARCHIV= +.ENDIF # "$(COM)"!="GCC" .ENDIF # "$(GUI)"=="WNT" .IF "$(RESLIB1NAME)" != "" --- solenv/inc/tg_lib.mk.orig 2003-07-17 03:20:32.000000000 +0900 +++ solenv/inc/tg_lib.mk 2003-12-27 13:19:14.000000000 +0900 @@ -118,9 +118,17 @@ @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd .ENDIF @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd - @source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @source $(MISC)$/$(LIB1ARCHIV:b).cmd .ELSE # "$(GUI)"=="UNX" +.IF "$(GUI)$(COM)"=="WNTGCC" + @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd + @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd +.ELSE @echo just a dummy > $@ +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # "$(GUI)"=="UNX" .ENDIF # "$(LIB$(TNR)ARCHIV)" != "" @@ -149,6 +157,10 @@ @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n 1 >> $@ .ELSE # "$(GUI)"=="MAC" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" + +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/./\./)$/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@ + @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n1 >> $@ +.ELSE $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES)) @+-$(RM) $(@:s/.lib/.lin/) .IF "$(LIB$(TNR)OBJFILES)"!="" @@ -158,6 +170,7 @@ @-$(TYPE) $(foreach,i,$(LIB$(TNR)FILES) $(i:s/.lib/.lin/)) >> $(@:s/.lib/.lin/) .ENDIF # "$(LIB$(TNR)FILES)"!="" @+$(ECHONL) +.ENDIF .ELSE # "$(GUI)"=="WNT" @+-$(RM) $@ +echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) --- solenv/inc/libs.mk.orig 2003-07-02 22:43:34.000000000 +0900 +++ solenv/inc/libs.mk 2004-01-18 12:37:10.000000000 +0900 @@ -66,7 +66,7 @@ LIBPRE=libr .ENDIF -.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" +.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(COM)"=="GCC" # #externe libs in plattform.mk @@ -76,9 +76,17 @@ ICUUCLIB=-licuuc I18NUTILLIB=-li18nutil$(COMID) .IF "$(WITH_GPC)"!="NO" +.IF "$(GUI)$(COM)"=="WNTGCC" +GPC3RDLIB=$(STATIC) -lgpc_static $(DYNAMIC) +.ELSE GPC3RDLIB=-lgpc .ENDIF +.ENDIF +.IF "$(GUI)"=="WNT" +SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID) +.ELSE SALHELPERLIB=-lsalhelper$(COMID) +.ENDIF XMLSCRIPTLIB =-lxcr$(OFFICEUPD)$(DLLPOSTFIX) .INCLUDE .IGNORE : comphelper$/version.mk COMPHELPERLIB=-lcomphelp$(COMPHLP_MAJOR)$(COMID) @@ -95,7 +103,11 @@ RTLLIB= TECLIB= CPPULIB=-lcppu +.IF "$(GUI)"=="WNT" +CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID) +.ELSE CPPUHELPERLIB=-lcppuhelper$(COMID) +.ENDIF .INCLUDE .IGNORE : ucbhelper$/version.mk UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID) REGLIB=-lreg @@ -112,7 +124,11 @@ SALTLSLIB=-lsaltls$(UDK_MAJOR) SALZIPLIB=-lsalzip$(UDK_MAJOR) RMCXTLIB=-lrmcxt +.IF "$(GUI)$(COM)"=="WNTGCC" +BTSTRPLIB=$(STATIC) -lbtstrp_static $(DYNAMIC) +.ELSE BTSTRPLIB=-lbtstrp +.ENDIF TRANSEXLIB=-ltransex IOTXLIB= OTXLIB=-lotx_ind @@ -129,7 +145,11 @@ LDAPSDKLIB=-lldap50 ONELIB= UNOLIB= +.IF "$(GUI)$(COM)"=="WNTGCC" +SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX).a +.ELSE SVLIBDEPEND=$(L)$/libvcl$(OFFICEUPD)$(DLLPOSTFIX)$(DLLPOST) +.ENDIF SVLIB=-lvcl$(OFFICEUPD)$(DLLPOSTFIX) ICOLIB=-lico$(OFFICEUPD)$(DLLPOSTFIX) BSTRPLIB=-lbtstrp @@ -171,13 +191,28 @@ HM2LIBST=-lhmwrap LINGULIB=$(HM2LIBST) LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)$(COM)"=="WNTGCC" +EXPAT3RDLIB=$(STATIC) -lexpat_xmlparse_static -lexpat_xmltok_static $(DYNAMIC) +EXPATASCII3RDLIB=$(STATIC) -lascii_expat_xmlparse_static -lexpat_xmltok_static $(DYNAMIC) +ZLIB3RDLIB=$(STATIC) -lzlib_static $(DYNAMIC) +.ELSE EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok ZLIB3RDLIB=-lzlib +.ENDIF +.IF "$(GUI)$(COM)"=="WNTGCC" +JPEG3RDLIB=$(STATIC) -ljpeglib_static $(DYNAMIC) +NEON3RDLIB=$(STATIC) -lneon_static $(DYNAMIC) +.ELSE JPEG3RDLIB=-ljpeglib NEON3RDLIB=-lneon +.ENDIF BERKELEYLIB=-ldb-3.2 +.IF "$(GUI)$(COM)"=="WNTGCC" +BERKELEYCPPLIB= +.ELSE BERKELEYCPPLIB=-ldb_cxx-3.2 +.ENDIF CURLLIB=-lcurl SFX2LIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX) SFXLIB=-lsfx$(OFFICEUPD)$(DLLPOSTFIX) @@ -212,7 +247,11 @@ PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX) SYSSHELLLIB=-lsysshell SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)"=="WNT" +JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) +.ELSE JVMACCESSLIB = -ljvmaccess$(COMID) +.ENDIF # # USED_%NAME%_LIBS --- solenv/inc/tg_app.mk.orig 2003-08-15 21:06:32.000000000 +0900 +++ solenv/inc/tg_app.mk 2004-01-17 23:44:26.000000000 +0900 @@ -113,6 +113,14 @@ .ENDIF .ENDIF +APP$(TNR)RESO= +.IF "$(GUI)" != "WNT" || "$(COM)" != "GCC" +.ELSE +.IF "$(APP$(TNR)LINKRES)" != "" || "$(APP$(TNR)RES)" != "" +APP$(TNR)RESO=$(MISC)$/$(APP$(TNR)TARGET)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP$(TNR)DEF=$(APP$(TNR)DEF) .ELSE @@ -219,7 +227,7 @@ .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" .IF "$(APP$(TNR)ICON)" != "" - @-+guw.pl echo 1 ICON \"$(APP$(TNR)ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc + @-+$(WRAPCMD) echo 1 ICON \"$(APP$(TNR)ICON)\" | sed 'sX\\X\\\\Xg' >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF .IF "$(APP$(TNR)VERINFO)" != "" @-+echo \#define VERVARIANT $(BUILD) >> $(MISC)$/$(APP$(TNR)LINKRES:b).rc @@ -228,6 +236,21 @@ .ENDIF # "$(USE_SHELL)"=="4nt" $(RC) -DWIN32 -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)$/$(APP$(TNR)LINKRES:b).rc .ENDIF # "$(APP$(TNR)LINKRES)" != "" +.IF "$(COM)" == "GCC" + @+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) +.ENDIF + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)$/$(INPATH)$/lib $(SOLARLIB) $(STDSLO) \ + $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \ + -Wl,-Map,$(MISC)$/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \ + `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` \ + $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(STDLIB) $(STDLIB$(TNR)) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -264,6 +287,7 @@ +if exist $(MISC)\$(APP$(TNR)TARGET).lst type $(MISC)\$(APP$(TNR)TARGET).lst >> $(MISC)\$(APP$(TNR)TARGET).lnk $(LINK) @$(MISC)\$(APP$(TNR)TARGET).lnk .ENDIF # "$(linkinc)" == "" +.ENDIF .IF "$(APP$(TNR)TARGET)" == "loader" +$(PERL) loader.pl $@ .IF "$(USE_SHELL)"=="4nt" --- solenv/inc/tg_def.mk.orig 2003-07-02 22:44:06.000000000 +0900 +++ solenv/inc/tg_def.mk 2004-01-10 14:31:26.000000000 +0900 @@ -172,9 +172,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL$(TNR)TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -182,6 +184,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL$(TNR)DESCRIPTION)"=="" .IF "$(DEFLIB$(TNR)NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL$(TNR)TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB$(TNR)NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL$(TNR)TARGET).exp >>$@ +.ELSE @+$(EXPORT$(TNR)_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL$(TNR)TARGET).exp $(SLB)$/$(DEFLIB$(TNR)NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF$(TNR)CEXP)"!="" @@ -192,6 +199,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT$(TNR)_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL$(TNR)TARGET).flt $(SHL$(TNR)TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT$(TNR)_PROTECT) $(RM) $(SHL$(TNR)TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -267,8 +275,12 @@ @echo $(DEF$(TNR)EXPORT20) >>$@ .ENDIF .IF "$(DEF$(TNR)EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF$(TNR)EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP$(TNR)HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" --- solenv/inc/_tg_def.mk.orig 2003-03-27 20:48:02.000000000 +0900 +++ solenv/inc/_tg_def.mk 2004-01-10 14:29:28.000000000 +0900 @@ -71,9 +71,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL1TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -81,6 +83,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL1DESCRIPTION)"=="" .IF "$(DEFLIB1NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL1TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB1NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL1TARGET).exp >>$@ +.ELSE @+$(EXPORT1_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL1TARGET).exp $(SLB)$/$(DEFLIB1NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF1CEXP)"!="" @@ -91,6 +98,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT1_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL1TARGET).flt $(SHL1TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT1_PROTECT) $(RM) $(SHL1TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -166,8 +174,12 @@ @echo $(DEF1EXPORT20) >>$@ .ENDIF .IF "$(DEF1EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF1EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF1EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP1HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -257,9 +269,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL2TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -267,6 +281,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL2DESCRIPTION)"=="" .IF "$(DEFLIB2NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL2TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB2NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL2TARGET).exp >>$@ +.ELSE @+$(EXPORT2_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL2TARGET).exp $(SLB)$/$(DEFLIB2NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF2CEXP)"!="" @@ -277,6 +296,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT2_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL2TARGET).flt $(SHL2TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT2_PROTECT) $(RM) $(SHL2TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -352,8 +372,12 @@ @echo $(DEF2EXPORT20) >>$@ .ENDIF .IF "$(DEF2EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF2EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF2EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP2HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -443,9 +467,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL3TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -453,6 +479,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL3DESCRIPTION)"=="" .IF "$(DEFLIB3NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL3TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB3NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL3TARGET).exp >>$@ +.ELSE @+$(EXPORT3_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL3TARGET).exp $(SLB)$/$(DEFLIB3NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF3CEXP)"!="" @@ -463,6 +494,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT3_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL3TARGET).flt $(SHL3TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT3_PROTECT) $(RM) $(SHL3TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -538,8 +570,12 @@ @echo $(DEF3EXPORT20) >>$@ .ENDIF .IF "$(DEF3EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF3EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF3EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP3HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -629,9 +665,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL4TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -639,6 +677,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL4DESCRIPTION)"=="" .IF "$(DEFLIB4NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL4TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB4NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL4TARGET).exp >>$@ +.ELSE @+$(EXPORT4_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL4TARGET).exp $(SLB)$/$(DEFLIB4NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF4CEXP)"!="" @@ -649,6 +692,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT4_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL4TARGET).flt $(SHL4TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT4_PROTECT) $(RM) $(SHL4TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -724,8 +768,12 @@ @echo $(DEF4EXPORT20) >>$@ .ENDIF .IF "$(DEF4EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF4EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF4EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP4HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -815,9 +863,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL5TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -825,6 +875,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL5DESCRIPTION)"=="" .IF "$(DEFLIB5NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL5TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB5NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL5TARGET).exp >>$@ +.ELSE @+$(EXPORT5_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL5TARGET).exp $(SLB)$/$(DEFLIB5NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF5CEXP)"!="" @@ -835,6 +890,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT5_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL5TARGET).flt $(SHL5TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT5_PROTECT) $(RM) $(SHL5TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -910,8 +966,12 @@ @echo $(DEF5EXPORT20) >>$@ .ENDIF .IF "$(DEF5EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF5EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF5EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP5HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -1001,9 +1061,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL6TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -1011,6 +1073,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL6DESCRIPTION)"=="" .IF "$(DEFLIB6NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL6TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB6NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL6TARGET).exp >>$@ +.ELSE @+$(EXPORT6_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL6TARGET).exp $(SLB)$/$(DEFLIB6NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF6CEXP)"!="" @@ -1021,6 +1088,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT6_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL6TARGET).flt $(SHL6TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT6_PROTECT) $(RM) $(SHL6TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -1096,8 +1164,12 @@ @echo $(DEF6EXPORT20) >>$@ .ENDIF .IF "$(DEF6EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF6EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF6EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP6HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -1187,9 +1259,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL7TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -1197,6 +1271,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL7DESCRIPTION)"=="" .IF "$(DEFLIB7NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL7TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB7NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL7TARGET).exp >>$@ +.ELSE @+$(EXPORT7_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL7TARGET).exp $(SLB)$/$(DEFLIB7NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF7CEXP)"!="" @@ -1207,6 +1286,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT7_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL7TARGET).flt $(SHL7TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT7_PROTECT) $(RM) $(SHL7TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -1282,8 +1362,12 @@ @echo $(DEF7EXPORT20) >>$@ .ENDIF .IF "$(DEF7EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF7EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF7EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP7HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -1373,9 +1457,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL8TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -1383,6 +1469,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL8DESCRIPTION)"=="" .IF "$(DEFLIB8NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL8TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB8NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL8TARGET).exp >>$@ +.ELSE @+$(EXPORT8_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL8TARGET).exp $(SLB)$/$(DEFLIB8NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF8CEXP)"!="" @@ -1393,6 +1484,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT8_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL8TARGET).flt $(SHL8TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT8_PROTECT) $(RM) $(SHL8TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -1468,8 +1560,12 @@ @echo $(DEF8EXPORT20) >>$@ .ENDIF .IF "$(DEF8EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF8EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF8EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP8HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -1559,9 +1655,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL9TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -1569,6 +1667,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL9DESCRIPTION)"=="" .IF "$(DEFLIB9NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL9TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB9NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL9TARGET).exp >>$@ +.ELSE @+$(EXPORT9_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL9TARGET).exp $(SLB)$/$(DEFLIB9NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF9CEXP)"!="" @@ -1579,6 +1682,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT9_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL9TARGET).flt $(SHL9TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT9_PROTECT) $(RM) $(SHL9TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -1654,8 +1758,12 @@ @echo $(DEF9EXPORT20) >>$@ .ENDIF .IF "$(DEF9EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF9EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF9EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP9HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" @@ -1745,9 +1853,11 @@ @echo ------------------------------ @echo Making Module-Definitionfile : $@ @echo LIBRARY $(SHL10TARGET) >$@ +.IF "$(COM)"!="GCC" @echo DESCRIPTION 'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@ @echo DATA READ WRITE SHARED >>$@ @echo HEAPSIZE 0 >>$@ +.ENDIF @echo EXPORTS >>$@ # getversioninfo fuer alle!! @echo GetVersionInfo >>$@ @@ -1755,6 +1865,11 @@ @echo component_getDescriptionFunc >>$@ .ENDIF # "$(NO_SHL10DESCRIPTION)"=="" .IF "$(DEFLIB10NAME)"!="" +.IF "$(COM)"=="GCC" + dlltool --output-def $(SHL10TARGET).exp --export-all-symbols \ + `$(TYPE) $(SLB)$/$(DEFLIB10NAME).lib | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` + tail --lines +3 $(SHL10TARGET).exp >>$@ +.ELSE @+$(EXPORT10_PROTECT) $(LIBMGR) -EXTRACT:/ /OUT:$(SHL10TARGET).exp $(SLB)$/$(DEFLIB10NAME).lib .IF "$(USE_LDUMP2)"=!"" .IF "$(DEF10CEXP)"!="" @@ -1765,6 +1880,7 @@ .ELSE # "$(USE_LDUMP2)"=!"" @+$(EXPORT10_PROTECT) $(LDUMP) -E 20 -F$(MISC)$/$(SHL10TARGET).flt $(SHL10TARGET).exp >>$@ .ENDIF # "$(USE_LDUMP2)"=!"" +.ENDIF +$(EXPORT10_PROTECT) $(RM) $(SHL10TARGET).exp # now *\defs\$(OUTPATH) exists, commit it .IF "$(BUILD_SOSL)"=="" @@ -1840,8 +1956,12 @@ @echo $(DEF10EXPORT20) >>$@ .ENDIF .IF "$(DEF10EXPORTFILE)"!="" +.IF "$(COM)"=="GCC" + +$(TYPE) $(DEF10EXPORTFILE) | sed -e s:PRIVATE:: >> $@ +.ELSE +$(TYPE) $(DEF10EXPORTFILE) >> $@ .ENDIF +.ENDIF .ENDIF # "$(APP10HEAP)"=="" .ENDIF # "$(GUI)"=="WNT" --- solenv/inc/settings.mk.orig 2003-08-15 21:06:22.000000000 +0900 +++ solenv/inc/settings.mk 2004-01-17 23:43:12.000000000 +0900 @@ -1101,7 +1101,7 @@ SVIDL=svidl .ELSE .IF "$(USE_SHELL)"!="4nt" -SVIDL=guw.pl svidl.exe +SVIDL=$(WRAPCMD) svidl.exe .ELSE SVIDL=svidl.exe .ENDIF @@ -1113,8 +1113,8 @@ .ENDIF .ELSE .IF "$(USE_SHELL)"!="4nt" -LDUMP=guw.pl ldump4 -LDUMP2=guw.pl ldump4 +LDUMP=$(WRAPCMD) ldump4 +LDUMP2=$(WRAPCMD) ldump4 .ELSE LDUMP=ldump4 LDUMP2=ldump4 @@ -1156,14 +1156,14 @@ RSC=rscdep .IF "$(GUI)"=="WNT" .IF "$(USE_SHELL)"!="4nt" -RSC=guw.pl rscdep +RSC=$(WRAPCMD) rscdep .ENDIF .ENDIF .ELSE RSC=rsc .IF "$(GUI)"=="WNT" .IF "$(USE_SHELL)"!="4nt" -RSC=guw.pl rsc +RSC=$(WRAPCMD) rsc .ENDIF .ENDIF .ENDIF @@ -1425,6 +1425,9 @@ .IF "$(NO_DEFAULT_STL)"=="" STDLIB+=$(LIBSTLPORT) STDSHL+=$(LIBSTLPORT) +.ELSE +STDLIB+=$(STDLIBCPP) +STDSHL+=$(STDLIBCPP) .ENDIF # "$(NO_DEFAULT_STL)"=="" # fill up unresolved symbols not found else where --- solenv/bin/getcompver.awk.orig 2003-07-02 22:42:36.000000000 +0900 +++ solenv/bin/getcompver.awk 2003-10-05 11:31:20.000000000 +0900 @@ -87,13 +87,13 @@ x = match( $0, /".*\..*\..*"/ ) CCversion = substr( $0, RSTART+1, RLENGTH-2) } -/^[0-9]*[.][0-9]*$/ { +/^[0-9]*[.][0-9]*\x0d*$/ { if ( compiler_matched == 0 ) { # need to blow to x.xx.xx for comparing CCversion = $0 ".0" } } -/^[0-9]*[.][0-9]*[.][0-9]*$/ { +/^[0-9]*[.][0-9]*[.][0-9]*\x0d*$/ { if ( compiler_matched == 0 ) { CCversion = $0 } --- solenv/bin/gum.pl.orig 2003-07-02 22:42:50.000000000 +0900 +++ solenv/bin/gum.pl 2004-01-18 00:03:28.000000000 +0900 @@ -90,38 +90,38 @@ # procedures #---------------------------------------------------------- -# Function name: WinFormat +# Function name: MingWCygwinFormat # Description: Format variables to Windows Format. # Arguments: 1. Variable (string) with one token # Return value: Reformatted String #---------------------------------------------------------- -sub WinFormat { +sub MingWCygwinFormat { my $variable = shift @_; my( $d1, $d1_prefix, $d2 ); $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables $variable =~ s/(\$\w+)/$1/eeg ; # expand the variables twice! $variable =~ s/:/;/g; - $variable =~ s/([;]|\A)(\w);/$1$2:/g; # get back the drives + $variable =~ s/([;]|\A|\A\s*-\w)(\w);/$1$2:/g; # get back the drives # Search for posix path ;entry; and replace with cygpath -w entry, accept quotes. while ( $variable =~ /(?:;|\A)[\'\"]?((?:\/[\w\.\- ~]+)+)[\'\"]?(?:;|\Z)/ ) { # Normal paths - if ( defined $debug ) { print(STDERR "WinFormat:\nnormal path:\n$variable\n");}; + if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\nnormal path:\n$variable\n");}; $d1 = $1 ; - chomp( $d2 = qx{cygpath -w "$d1"} ) ; + chomp( $d2 = qx{cygpath -m "$d1"} ) ; $variable =~ s/$d1/$d2/ ; } if ( $variable =~ /\A(-\w)[\'\"]?((?:\/[\w\.\- ~]+)+\/?)[\'\"]?\Z/ ) { # Include paths (sometimes with "/" at the end) # This regex: option -> $1, filename without quotes -> $2 - if ( defined $debug ) { print(STDERR "WinFormat:\ninclude path:\n$variable\n");}; + if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\ninclude path:\n$variable\n");}; $d1_prefix = $1; $d1 = $2; # Some programs (e.g. rsc have problems with filenames with spaces), use short dos paths if ( $d1 =~ / / ) { - chomp( $d1 = qx{cygpath -d "$d1"} ); + chomp( $d1 = qx{cygpath -m "$d1"} ); } else { - chomp( $d1 = qx{cygpath -w "$d1"} ); + chomp( $d1 = qx{cygpath -m "$d1"} ); } - # "cygpath -d" returns "" if the file doesn't exist. + # "cygpath -m" returns "" if the file doesn't exist. if ($d1 eq "") { $d1 = "."; print(STDERR "Error: guw.pl: Option:$variable:\nhas a problem! Probably nonexistent filename with space.\n"); @@ -129,13 +129,12 @@ $variable = $d1_prefix.$d1; } if ( $variable =~ /-\w[\'\"]?(?:(?:\/[\w\.\- ~]+)+)/ ) { - print(STDERR "Error: guw.pl: WinFormat: Not converted -X/... type switch in :$variable:.\n"); + print(STDERR "Error: guw.pl: MingWCygwinFormat: Not converted -X/... type switch in :$variable:.\n"); if ( (defined $debug_light) or (defined $debug) ) { die "\nNot processed -X/...\n"; } } - $variable =~ s/\//\\/g; # Remaining \ come from e.g.: ../foo/baa $variable =~ s/^\\$/\//g; # a single "/" needs to be preserved - if ( defined $debug ) { print(STDERR "WinFormat:\nresult:$variable\n");}; + if ( defined $debug ) { print(STDERR "MingWCygwinFormat:\nresult:$variable\n");}; return $variable; } @@ -183,7 +182,7 @@ print(CMD join(' ', @cmd_file)); close(CMD); # convert '@filename' to dos style - $para = WinFormat( $para ); + $para = MingWCygwinFormat( $para ); if ( defined $debug ) { print(STDERR "----------------------------\n");}; if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\nParameter in File:".join(' ', @cmd_file).":\n");} $para = "@".$para; @@ -205,7 +204,7 @@ } } if( $is_no_para ) { - $para = WinFormat($para); + $para = MingWCygwinFormat($para); } if ( defined $debug ) { print(STDERR "Converted line:${para}:\n" );}; } # else @@ -241,7 +240,7 @@ if ( defined $this_var ) { if ( defined $debug ) { print(STDERR "ENV $one_var before: ".$ENV{ $one_var}."\n" );}; - $ENV{ $one_var } = WinFormat( $this_var ); + $ENV{ $one_var } = MingWCygwinFormat( $this_var ); if ( defined $debug ) { print(STDERR "ENV $one_var after : ".$ENV{ $one_var}."\n" );}; } }