--- oo_1.1.1_src/solenv/inc/tg_slo.mk.orig 2001-12-10 22:00:32.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/tg_slo.mk 2004-03-29 12:17:40.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 > $@ --- oo_1.1.1_src/solenv/inc/tg_obj.mk.orig 2003-04-29 01:45:14.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/tg_obj.mk 2004-03-29 12:17:40.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/) --- oo_1.1.1_src/solenv/inc/tg_lib.mk.orig 2003-07-17 03:20:32.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/tg_lib.mk 2004-03-29 12:17:40.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) --- oo_1.1.1_src/solenv/inc/tg_def.mk.orig 2003-07-02 22:44:06.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/tg_def.mk 2004-03-29 12:17:40.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" --- oo_1.1.1_src/solenv/inc/_tg_lib.mk.orig 2003-07-17 03:19:28.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/_tg_lib.mk 2004-03-29 12:17:40.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) --- oo_1.1.1_src/solenv/inc/target.mk.orig 2003-07-04 00:27:28.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/target.mk 2004-03-29 12:17:40.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!:=$(LIB1ARCHIV:d)$(LIB1ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB2TARGET)" != "" LIB2 ?= TNR!:=2 LIB2TARGETN=$(LIB2TARGET) +.IF "$(LIB2ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB2ARCHIV!:=$(LIB2ARCHIV:d)$(LIB2ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB3TARGET)" != "" LIB3 ?= TNR!:=3 LIB3TARGETN=$(LIB3TARGET) +.IF "$(LIB3ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB3ARCHIV!:=$(LIB3ARCHIV:d)$(LIB3ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB4TARGET)" != "" LIB4 ?= TNR!:=4 LIB4TARGETN=$(LIB4TARGET) +.IF "$(LIB4ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB4ARCHIV!:=$(LIB4ARCHIV:d)$(LIB4ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB5TARGET)" != "" LIB5 ?= TNR!:=5 LIB5TARGETN=$(LIB5TARGET) +.IF "$(LIB5ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB5ARCHIV!:=$(LIB5ARCHIV:d)$(LIB5ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB6TARGET)" != "" LIB6 ?= TNR!:=6 LIB6TARGETN=$(LIB6TARGET) +.IF "$(LIB6ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB6ARCHIV!:=$(LIB6ARCHIV:d)$(LIB6ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB7TARGET)" != "" LIB7 ?= TNR!:=7 LIB7TARGETN=$(LIB7TARGET) +.IF "$(LIB7ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB7ARCHIV!:=$(LIB7ARCHIV:d)$(LIB7ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB8TARGET)" != "" LIB8 ?= TNR!:=8 LIB8TARGETN=$(LIB8TARGET) +.IF "$(LIB8ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB8ARCHIV!:=$(LIB8ARCHIV:d)$(LIB8ARCHIV:b)_static.a +.ENDIF +.ENDIF .ENDIF .IF "$(LIB9TARGET)" != "" LIB9 ?= TNR!:=9 LIB9TARGETN=$(LIB9TARGET) +.IF "$(LIB9ARCHIV)" != "" +.IF "$(GUI)$(COM)"=="WNTGCC" +LIB9ARCHIV!:=$(LIB9ARCHIV:d)$(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)" != "" --- oo_1.1.1_src/solenv/inc/rules.mk.orig 2004-01-10 03:59:10.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/rules.mk 2004-03-29 12:17:40.000000000 +0900 @@ -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)$(PWD)$/$*.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 ------------------------------ @@ -181,12 +197,12 @@ +if ( -e $(@:s/.obj/.o/)) $(TOUCH) $@ .ENDIF .ELSE - @+$(TYPE) $(mktmp $(CXX) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$*.obj $*.c ) + @+$(TYPE) $(mktmp $(CC) $(CFLAGS:s/stl/dont_use_stl/) $(CFLAGSCC) $(CFLAGSOBJ) $(PCHOBJFLAGSU) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c ) @+$(ECHONL) + +-@echo Cflags: $(CFLAGS) .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 ) .ENDIF .ENDIF @@ -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 @@ -584,6 +604,15 @@ $(SLO)$/%.obj : %.asm @echo ------------------------------ @echo Making: $@ +.IF "$(COM)"=="GCC" +.IF "$(ASM)"=="ml" + $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)\$*.obj $*.asm + @+-$(RM) $*.err >& nul +.ELSE # "$(ASM)"=="ml" + @+-$(RM) $@ >& nul + $(ASM) $(AFLAGS) $*.asm,$(SLO)\$*.obj; +.ENDIF # "$(ASM)"=="ml" +.ELSE .IF "$(COM)"=="WTC" $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)\$*.obj +-if exist $*.err @del $*.err @@ -598,6 +627,7 @@ .ENDIF # "$(ASM)"=="ml" .ENDIF "$(COM)"=="MSC" .ENDIF +.ENDIF $(OBJ)$/%.obj : %.asm @echo ------------------------------ @@ -625,7 +655,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) $< ) --- oo_1.1.1_src/solenv/inc/_tg_def.mk.orig 2003-03-27 20:48:02.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/_tg_def.mk 2004-03-29 12:17:40.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" --- oo_1.1.1_src/solenv/inc/tg_app.mk.orig 2004-01-29 02:30:40.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/tg_app.mk 2004-03-29 12:17:40.000000000 +0900 @@ -113,6 +113,13 @@ .ENDIF .ENDIF +APP$(TNR)RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.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 @@ -197,7 +204,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 @@ -206,6 +213,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) \ @@ -242,8 +264,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" --- oo_1.1.1_src/solenv/inc/_tg_app.mk.orig 2004-01-29 02:29:50.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/_tg_app.mk 2004-03-29 12:17:40.000000000 +0900 @@ -18,6 +18,13 @@ .ENDIF .ENDIF +APP1RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != "" +APP1RESO=$(MISC)$/$(APP1TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP1DEF=$(APP1DEF) .ELSE @@ -102,7 +109,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 @@ -111,6 +118,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) $(APP1STDLIBS) $(STDLIB) $(STDLIB1) > $(MISC)$/$(@:b).cmd + @+$(TYPE) $(MISC)$/$(@:b).cmd + @+source $(MISC)$/$(@:b).cmd + @ls -l $@ +.ELSE .IF "$(linkinc)" == "" $(LINK) @$(mktmp \ $(LINKFLAGS) \ @@ -147,8 +169,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -210,6 +233,13 @@ .ENDIF .ENDIF +APP2RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != "" +APP2RESO=$(MISC)$/$(APP2TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP2DEF=$(APP2DEF) .ELSE @@ -294,7 +324,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 @@ -303,6 +333,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) \ @@ -339,8 +384,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -402,6 +448,13 @@ .ENDIF .ENDIF +APP3RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != "" +APP3RESO=$(MISC)$/$(APP3TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP3DEF=$(APP3DEF) .ELSE @@ -486,7 +539,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 @@ -495,6 +548,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) \ @@ -531,8 +599,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -594,6 +663,13 @@ .ENDIF .ENDIF +APP4RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != "" +APP4RESO=$(MISC)$/$(APP4TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP4DEF=$(APP4DEF) .ELSE @@ -678,7 +754,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 @@ -687,6 +763,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) \ @@ -723,8 +814,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -786,6 +878,13 @@ .ENDIF .ENDIF +APP5RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != "" +APP5RESO=$(MISC)$/$(APP5TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP5DEF=$(APP5DEF) .ELSE @@ -870,7 +969,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 @@ -879,6 +978,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) \ @@ -915,8 +1029,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -978,6 +1093,13 @@ .ENDIF .ENDIF +APP6RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != "" +APP6RESO=$(MISC)$/$(APP6TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP6DEF=$(APP6DEF) .ELSE @@ -1062,7 +1184,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 @@ -1071,6 +1193,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) \ @@ -1107,8 +1244,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -1170,6 +1308,13 @@ .ENDIF .ENDIF +APP7RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != "" +APP7RESO=$(MISC)$/$(APP7TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP7DEF=$(APP7DEF) .ELSE @@ -1254,7 +1399,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 @@ -1263,6 +1408,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) \ @@ -1299,8 +1459,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -1362,6 +1523,13 @@ .ENDIF .ENDIF +APP8RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != "" +APP8RESO=$(MISC)$/$(APP8TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP8DEF=$(APP8DEF) .ELSE @@ -1446,7 +1614,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 @@ -1455,6 +1623,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) \ @@ -1491,8 +1674,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -1554,6 +1738,13 @@ .ENDIF .ENDIF +APP9RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != "" +APP9RESO=$(MISC)$/$(APP9TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP9DEF=$(APP9DEF) .ELSE @@ -1638,7 +1829,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 @@ -1647,6 +1838,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) \ @@ -1683,8 +1889,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" @@ -1746,6 +1953,13 @@ .ENDIF .ENDIF +APP10RESO= +.IF "$(GUI)$(COM)" == "WNTGCC" +.IF "$(APP10LINKRES)" != "" || "$(APP10RES)" != "" +APP10RESO=$(MISC)$/$(APP10TARGET:b)_res.o +.ENDIF +.ENDIF + .IF "$(GUI)" != "WNT" || "$(GUI)$(COM)"=="WNTBLC" USE_APP10DEF=$(APP10DEF) .ELSE @@ -1830,7 +2044,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 @@ -1839,6 +2053,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) \ @@ -1875,8 +2104,9 @@ +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 $@ + +$(PERL) $(PRJ)$/util$/loader.pl $@ .IF "$(USE_SHELL)"=="4nt" +$(COPY) /b $(@)+$(@:d)unloader.exe $(@:d)_new.exe .ELSE # "$(USE_SHELL)"=="4nt" --- oo_1.1.1_src/solenv/inc/settings.mk.orig 2004-01-10 03:59:12.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/settings.mk 2004-03-29 12:17:40.000000000 +0900 @@ -790,8 +790,12 @@ .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="WNT" +.IF "$(COM)"=="GCC" +SHELLLIB=-lgdi32 -lshell32 -ladvapi32 -lcomdlg32 +.ELSE SHELLLIB=$(LIBPRE) gdi32.lib $(LIBPRE) shell32.lib $(LIBPRE) advapi32.lib $(LIBPRE) comdlg32.lib .ENDIF +.ENDIF .IF "$(GUI)"=="WIN" SHELLLIB=$(LIBPRE) shell.lib .ENDIF @@ -1105,7 +1109,7 @@ SVIDL=svidl .ELSE .IF "$(USE_SHELL)"!="4nt" -SVIDL=guw.pl svidl.exe +SVIDL=$(WRAPCMD) svidl.exe .ELSE SVIDL=svidl.exe .ENDIF @@ -1117,8 +1121,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 @@ -1160,14 +1164,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 @@ -1377,6 +1381,20 @@ .ENDIF .ENDIF .ENDIF # "$(PRJPCH)"!="" + +STDLIB= +STDSHL= + +.IF "$(GUI)$(COM)"=="WNTGCC" +.IF "$(NO_DEFAULT_STL)"=="" +STDLIB+=$(LIBSTLPORT) +STDSHL+=$(LIBSTLPORT) +.ELSE +STDLIB+=$(STDLIBCPP) +STDSHL+=$(STDLIBCPP) +.ENDIF # "$(NO_DEFAULT_STL)"=="" +.ENDIF + # # Zusammenbau der Flags und CDefs fuer GUI .IF "$(TARGETTYPE)"=="GUI" @@ -1391,13 +1409,13 @@ .IF "$(TARGETTHREAD)"=="MT" CDEFSOBJ+= $(CDEFSMT) $(CDEFSOBJMT) CFLAGSOBJ+=$(CFLAGSOBJGUIMT) -STDLIB=$(STDLIBGUIMT) -STDSHL=$(STDSHLGUIMT) +STDLIB+=$(STDLIBGUIMT) +STDSHL+=$(STDSHLGUIMT) .ELSE CDEFSOBJ+= $(CDEFSST) $(CDEFSOBJST) CFLAGSOBJ+=$(CFLAGSOBJGUIST) -STDLIB=$(STDLIBGUIST) -STDSHL=$(STDSHLGUIST) +STDLIB+=$(STDLIBGUIST) +STDSHL+=$(STDSHLGUIST) .ENDIF .ENDIF @@ -1415,21 +1433,26 @@ .IF "$(TARGETTHREAD)" == "MT" || "$(TARGETTHREAD)"=="mt" CDEFSOBJ+=$(CDEFSMT) $(CDEFSOBJMT) CFLAGSOBJ+=$(CFLAGSOBJCUIMT) -STDLIB=$(STDLIBCUIMT) -STDSHL=$(STDSHLCUIMT) +STDLIB+=$(STDLIBCUIMT) +STDSHL+=$(STDSHLCUIMT) .ELSE CDEFSOBJ+=$(CDEFSST) $(CDEFSOBJST) CFLAGSOBJ+=$(CFLAGSOBJCUIST) -STDLIB=$(STDLIBCUIST) -STDSHL=$(STDSHLCUIST) +STDLIB+=$(STDLIBCUIST) +STDSHL+=$(STDSHLCUIST) .ENDIF .ENDIF +.IF "$(GUI)$(COM)"!="WNTGCC" .IF "$(NO_DEFAULT_STL)"=="" STDLIB+=$(LIBSTLPORT) STDSHL+=$(LIBSTLPORT) +.ELSE +STDLIB+=$(STDLIBCPP) +STDSHL+=$(STDLIBCPP) .ENDIF # "$(NO_DEFAULT_STL)"=="" +.ENDIF # fill up unresolved symbols not found else where .IF "$(FILLUPARC)"!="" --- oo_1.1.1_src/solenv/inc/_tg_shl.mk.orig 2004-01-29 02:30:16.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/_tg_shl.mk 2004-03-29 12:17:40.000000000 +0900 @@ -56,7 +56,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL1IMPLIB)" != "" USE_1IMPLIB=-implib:$(LB)$/$(SHL1IMPLIB).lib .ELSE # "$(SHL1IMPLIB)" != "" @@ -165,6 +165,7 @@ SHL1RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL1RES)) SHL1ALLRES+=$(SHL1RES) SHL1LINKRES*=$(MISC)$/$(SHL1TARGET).res +SHL1LINKRESO*=$(MISC)$/$(SHL1TARGET)_res.o .ENDIF # "$(SHL1RES)"!="" .ENDIF @@ -172,6 +173,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)"=="" @@ -214,7 +216,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) $(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" @@ -244,17 +246,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL1ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" @+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) \ @@ -270,7 +289,6 @@ $(STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL1BASEX) \ @@ -303,6 +321,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" @@ -455,7 +474,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL2IMPLIB)" != "" USE_2IMPLIB=-implib:$(LB)$/$(SHL2IMPLIB).lib .ELSE # "$(SHL2IMPLIB)" != "" @@ -564,6 +583,7 @@ SHL2RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL2RES)) SHL2ALLRES+=$(SHL2RES) SHL2LINKRES*=$(MISC)$/$(SHL2TARGET).res +SHL2LINKRESO*=$(MISC)$/$(SHL2TARGET)_res.o .ENDIF # "$(SHL2RES)"!="" .ENDIF @@ -571,6 +591,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)"=="" @@ -613,7 +634,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) $(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" @@ -643,17 +664,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL2ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + @+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) \ @@ -669,7 +707,6 @@ $(STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL2BASEX) \ @@ -702,6 +739,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" @@ -854,7 +892,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL3IMPLIB)" != "" USE_3IMPLIB=-implib:$(LB)$/$(SHL3IMPLIB).lib .ELSE # "$(SHL3IMPLIB)" != "" @@ -963,6 +1001,7 @@ SHL3RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL3RES)) SHL3ALLRES+=$(SHL3RES) SHL3LINKRES*=$(MISC)$/$(SHL3TARGET).res +SHL3LINKRESO*=$(MISC)$/$(SHL3TARGET)_res.o .ENDIF # "$(SHL3RES)"!="" .ENDIF @@ -970,6 +1009,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)"=="" @@ -1012,7 +1052,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) $(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" @@ -1042,17 +1082,34 @@ +$(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) --kill-at --output-exp $(MISC)$/$(@:b).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,$(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) --kill-at --output-lib $(LB)$/lib$(SHL3ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(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) \ @@ -1068,7 +1125,6 @@ $(STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL3BASEX) \ @@ -1101,6 +1157,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" @@ -1253,7 +1310,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL4IMPLIB)" != "" USE_4IMPLIB=-implib:$(LB)$/$(SHL4IMPLIB).lib .ELSE # "$(SHL4IMPLIB)" != "" @@ -1362,6 +1419,7 @@ SHL4RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL4RES)) SHL4ALLRES+=$(SHL4RES) SHL4LINKRES*=$(MISC)$/$(SHL4TARGET).res +SHL4LINKRESO*=$(MISC)$/$(SHL4TARGET)_res.o .ENDIF # "$(SHL4RES)"!="" .ENDIF @@ -1369,6 +1427,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)"=="" @@ -1411,7 +1470,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) $(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" @@ -1441,17 +1500,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL4ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + @+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) \ @@ -1467,7 +1543,6 @@ $(STDSHL) $(STDSHL4) \ $(SHL4LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL4BASEX) \ @@ -1500,6 +1575,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" @@ -1652,7 +1728,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL5IMPLIB)" != "" USE_5IMPLIB=-implib:$(LB)$/$(SHL5IMPLIB).lib .ELSE # "$(SHL5IMPLIB)" != "" @@ -1761,6 +1837,7 @@ SHL5RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL5RES)) SHL5ALLRES+=$(SHL5RES) SHL5LINKRES*=$(MISC)$/$(SHL5TARGET).res +SHL5LINKRESO*=$(MISC)$/$(SHL5TARGET)_res.o .ENDIF # "$(SHL5RES)"!="" .ENDIF @@ -1768,6 +1845,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)"=="" @@ -1810,7 +1888,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) $(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" @@ -1840,17 +1918,34 @@ +$(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) --kill-at --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(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) --kill-at --output-lib $(LB)$/lib$(SHL5ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" @+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,$(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) \ @@ -1866,7 +1961,6 @@ $(STDSHL) $(STDSHL5) \ $(SHL5LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL5BASEX) \ @@ -1899,6 +1993,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" @@ -2051,7 +2146,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL6IMPLIB)" != "" USE_6IMPLIB=-implib:$(LB)$/$(SHL6IMPLIB).lib .ELSE # "$(SHL6IMPLIB)" != "" @@ -2160,6 +2255,7 @@ SHL6RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL6RES)) SHL6ALLRES+=$(SHL6RES) SHL6LINKRES*=$(MISC)$/$(SHL6TARGET).res +SHL6LINKRESO*=$(MISC)$/$(SHL6TARGET)_res.o .ENDIF # "$(SHL6RES)"!="" .ENDIF @@ -2167,6 +2263,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)"=="" @@ -2209,7 +2306,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) $(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" @@ -2239,17 +2336,34 @@ +$(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) --kill-at --output-exp $(MISC)$/$(@:b).exp + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(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) --kill-at --output-lib $(LB)$/lib$(SHL6ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" @+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,$(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) \ @@ -2265,7 +2379,6 @@ $(STDSHL) $(STDSHL6) \ $(SHL6LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL6BASEX) \ @@ -2298,6 +2411,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" @@ -2450,7 +2564,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL7IMPLIB)" != "" USE_7IMPLIB=-implib:$(LB)$/$(SHL7IMPLIB).lib .ELSE # "$(SHL7IMPLIB)" != "" @@ -2559,6 +2673,7 @@ SHL7RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL7RES)) SHL7ALLRES+=$(SHL7RES) SHL7LINKRES*=$(MISC)$/$(SHL7TARGET).res +SHL7LINKRESO*=$(MISC)$/$(SHL7TARGET)_res.o .ENDIF # "$(SHL7RES)"!="" .ENDIF @@ -2566,6 +2681,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)"=="" @@ -2608,7 +2724,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) $(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" @@ -2638,17 +2754,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL7ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" @+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) \ @@ -2664,7 +2797,6 @@ $(STDSHL) $(STDSHL7) \ $(SHL7LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL7BASEX) \ @@ -2697,6 +2829,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" @@ -2849,7 +2982,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL8IMPLIB)" != "" USE_8IMPLIB=-implib:$(LB)$/$(SHL8IMPLIB).lib .ELSE # "$(SHL8IMPLIB)" != "" @@ -2958,6 +3091,7 @@ SHL8RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL8RES)) SHL8ALLRES+=$(SHL8RES) SHL8LINKRES*=$(MISC)$/$(SHL8TARGET).res +SHL8LINKRESO*=$(MISC)$/$(SHL8TARGET)_res.o .ENDIF # "$(SHL8RES)"!="" .ENDIF @@ -2965,6 +3099,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)"=="" @@ -3007,7 +3142,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) $(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" @@ -3037,17 +3172,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL8ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + @+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) \ @@ -3063,7 +3215,6 @@ $(STDSHL) $(STDSHL8) \ $(SHL8LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL8BASEX) \ @@ -3096,6 +3247,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" @@ -3248,7 +3400,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL9IMPLIB)" != "" USE_9IMPLIB=-implib:$(LB)$/$(SHL9IMPLIB).lib .ELSE # "$(SHL9IMPLIB)" != "" @@ -3357,6 +3509,7 @@ SHL9RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL9RES)) SHL9ALLRES+=$(SHL9RES) SHL9LINKRES*=$(MISC)$/$(SHL9TARGET).res +SHL9LINKRESO*=$(MISC)$/$(SHL9TARGET)_res.o .ENDIF # "$(SHL9RES)"!="" .ENDIF @@ -3364,6 +3517,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)"=="" @@ -3406,7 +3560,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) $(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" @@ -3436,17 +3590,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL9ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" @+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) \ @@ -3462,7 +3633,6 @@ $(STDSHL) $(STDSHL9) \ $(SHL9LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL9BASEX) \ @@ -3495,6 +3665,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" @@ -3647,7 +3818,7 @@ .IF "$(GUI)" != "UNX" .IF "$(GUI)" == "WNT" -.IF "$(COM)" == "MSC" +.IF "$(COM)" != "GCC" .IF "$(SHL10IMPLIB)" != "" USE_10IMPLIB=-implib:$(LB)$/$(SHL10IMPLIB).lib .ELSE # "$(SHL10IMPLIB)" != "" @@ -3756,6 +3927,7 @@ SHL10RES!:=$(subst,$(RES)$/,$(RES)$/$(defaultlangext)$/ $(SHL10RES)) SHL10ALLRES+=$(SHL10RES) SHL10LINKRES*=$(MISC)$/$(SHL10TARGET).res +SHL10LINKRESO*=$(MISC)$/$(SHL10TARGET)_res.o .ENDIF # "$(SHL10RES)"!="" .ENDIF @@ -3763,6 +3935,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)"=="" @@ -3805,7 +3978,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) $(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" @@ -3835,17 +4008,34 @@ +$(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) --kill-at --output-exp $(MISC)$/$(@:b).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,$(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) --kill-at --output-lib $(LB)$/lib$(SHL10ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + @+echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) -o$@ \ + $(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) \ @@ -3861,7 +4051,6 @@ $(STDSHL) $(STDSHL10) \ $(SHL10LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL10BASEX) \ @@ -3894,6 +4083,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" @@ -4014,14 +4204,24 @@ @echo ------------------------------ @echo Making: $(SHL1IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL1DEF) --dllname $(SHL1TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL1ARCHIV).a --output-exp $(LB)$/lib$(SHL1TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4064,14 +4264,24 @@ @echo ------------------------------ @echo Making: $(SHL2IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL2DEF) --dllname $(SHL2TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL2ARCHIV).a --output-exp $(LB)$/lib$(SHL2TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4114,14 +4324,24 @@ @echo ------------------------------ @echo Making: $(SHL3IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL3DEF) --dllname $(SHL3TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL3ARCHIV).a --output-exp $(LB)$/lib$(SHL3TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4164,14 +4384,24 @@ @echo ------------------------------ @echo Making: $(SHL4IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL4DEF) --dllname $(SHL4TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL4ARCHIV).a --output-exp $(LB)$/lib$(SHL4TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4214,14 +4444,24 @@ @echo ------------------------------ @echo Making: $(SHL5IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL5DEF) --dllname $(SHL5TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL5ARCHIV).a --output-exp $(LB)$/lib$(SHL5TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4264,14 +4504,24 @@ @echo ------------------------------ @echo Making: $(SHL6IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL6DEF) --dllname $(SHL6TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL6ARCHIV).a --output-exp $(LB)$/lib$(SHL6TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4314,14 +4564,24 @@ @echo ------------------------------ @echo Making: $(SHL7IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL7DEF) --dllname $(SHL7TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL7ARCHIV).a --output-exp $(LB)$/lib$(SHL7TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4364,14 +4624,24 @@ @echo ------------------------------ @echo Making: $(SHL8IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL8DEF) --dllname $(SHL8TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL8ARCHIV).a --output-exp $(LB)$/lib$(SHL8TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4414,14 +4684,24 @@ @echo ------------------------------ @echo Making: $(SHL9IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL9DEF) --dllname $(SHL9TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL9ARCHIV).a --output-exp $(LB)$/lib$(SHL9TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" @@ -4464,6 +4744,15 @@ @echo ------------------------------ @echo Making: $(SHL10IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL10DEF) --dllname $(SHL10TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL10ARCHIV).a --output-exp $(LB)$/lib$(SHL10TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(RM) $@ + @$(TOUCH) $@ +.ELSE # bei use_deffile implib von linker erstellt .IF "$(USE_DEFFILE)"=="" $(IMPLIB) $(IMPLIBFLAGS) @$(mktmp -out:$(SHL10IMPLIBN) \ @@ -4471,6 +4760,7 @@ .ELSE # "$(GUI)" == "WNT" +$(TOUCH) $@ +@echo build of $(SHL10TARGETN) creates $@ +.ENDIF .ENDIF # "$(GUI)" == "WNT" .ELSE .IF "$(GUI)" == "WIN" || "$(GUI)" == "OS2" --- oo_1.1.1_src/solenv/inc/tg_shl.mk.orig 2004-01-29 02:31:06.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/tg_shl.mk 2004-03-29 12:17:40.000000000 +0900 @@ -156,7 +156,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)" != "" @@ -265,6 +265,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 @@ -272,6 +273,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)"=="" @@ -314,7 +316,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) $(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" @@ -344,17 +346,34 @@ +$(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) --kill-at --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) --kill-at --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a +.ELSE # "$(USE_DEFFILE)"!="" + @+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) \ @@ -370,7 +389,6 @@ $(STDSHL) $(STDSHL$(TNR)) \ $(SHL$(TNR)LINKRES) \ ) -.ENDIF # "$(COM)"=="GCC" .ELSE # "$(USE_DEFFILE)"!="" $(LINK) @$(mktmp $(LINKFLAGS) \ $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \ @@ -403,6 +421,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" @@ -570,14 +589,24 @@ @echo ------------------------------ @echo Making: $(SHL$(TNR)IMPLIBN) .IF "$(GUI)" == "WNT" +.IF "$(COM)"=="GCC" + @echo no ImportLibs on mingw +.IF "$(USE_DEFFILE)"=="" + @echo build .a instead + dlltool --input-def $(SHL$(TNR)DEF) --dllname $(SHL$(TNR)TARGET)$(DLLPOST) --kill-at --output-lib $(LB)$/lib$(SHL$(TNR)ARCHIV).a --output-exp $(LB)$/lib$(SHL$(TNR)TARGET).exp +.ENDIF # "$(USE_DEFFILE)=="" + @+-$(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)"=="" --- oo_1.1.1_src/solenv/inc/wnt.mk.orig 2004-01-10 03:59:18.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/wnt.mk 2004-03-29 12:17:40.000000000 +0900 @@ -444,6 +444,28 @@ RCLINKFLAGS= RCSETVERSION= +ADVAPI32LIB=advapi32.lib +SHELL32LIB=shell32.lib +GDI32LIB=gdi32.lib +OLE32LIB=ole32.lib +OLEAUT32LIB=oleaut32.lib +UUIDLIB=uuid.lib +WINSPOOLLIB=winspool.lib +IMM32LIB=imm32.lib +PSPLIB=apsp.lib +VERSIONLIB=version.lib +WINMMLIB=winmm.lib +WSOCK32LIB=wsock32.lib +MPRLIB=mpr.lib +WS2_32LIB=ws2_32.lib +UNICOWSLIB=unicows.lib +KERNEL32LIB=kernel32.lib +USER32LIB=user32.lib +MSVCRTLIB=msvcrt.lib +COMDLG32LIB=comdlg32.lib +COMCTL32LIB=comctl32.lib +DBGHELPLIB=dbghelp.lib +PSAPILIB=psapi.lib DLLPOSTFIX=mi @@ -470,29 +492,37 @@ .IF "$(COM)" == "GCC" .IF "$(CPU)" == "I" -ASM= -AFLAGS= +ASM=ml +AFLAGS=/c /Cp /coff -CXX*=gcc +CXX*=$(WRAPCMD) gcc ### Der gcc vertraegt kein Semikolon im Include-Pfad RT # old: #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_NO_EXCEPTIONS=-fno-exceptions - -CFLAGSOBJGUIST=-DWIN32 -CFLAGSOBJCUIST=-DWIN32 -CFLAGSOBJGUIMT=-DWIN32 -CFLAGSOBJCUIMT=-DWIN32 -CFLAGSSLOGUIMT=-DWIN32 -fPIC -CFLAGSSLOCUIMT=-DWIN32 -fPIC +CFLAGS+=-nostdinc +CFLAGSCC=-pipe -march=pentiumpro +CFLAGSCXX=-pipe -march=pentiumpro -fno-for-scope -fpermissive +CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs +CFLAGS_NO_EXCEPTIONS= + +CFLAGSOBJGUIST=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_DLL +CFLAGSOBJCUIST=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_DLL +CFLAGSOBJGUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL +CFLAGSOBJCUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL +CFLAGSSLOGUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL +CFLAGSSLOCUIMT=-DWIN32 -DWINVER=0x0500 -D_WIN32_IE=0x400 -D_MT -D_DLL CFLAGSPROF= CFLAGSDEBUG=-g CFLAGSDBGUTIL= @@ -501,55 +531,106 @@ CFLAGSOUTOBJ=-o #plattform hart setzen CDEFS+=-D_M_IX86 +CDEFS+=-DSTLPORT_VERSION=450 -D_STLP_USE_DYNAMIC_LIB -STATIC= -static -DYNAMIC= -dynamic +STATIC= +DYNAMIC= -LINK*=ld +LINK*=$(WRAPCMD) 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=-nostdlib -Wl,--enable-runtime-pseudo-reloc -L$(CYGLIB) +LINKFLAGSAPPGUI=-Wl,--enable-stdcall-fixup -mwindows $(COMPATH)$/lib$/crt2.o +LINKFLAGSSHLGUI=-Wl,--enable-stdcall-fixup -mwindows -shared --warn-once $(COMPATH)$/lib$/dllcrt2.o +LINKFLAGSAPPCUI=-Wl,--enable-stdcall-fixup -mconsole $(COMPATH)$/lib$/crt2.o +LINKFLAGSSHLCUI=-Wl,--enable-stdcall-fixup -mconsole -shared --warn-once $(COMPATH)$/lib$/dllcrt2.o LINKFLAGSTACK= LINKFLAGSPROF= LINKFLAGSDEBUG=-g LINKFLAGSOPT= STDLIBCPP=-lstdc++ +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=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBGUIST+= -lmsvcrt +STDLIBCUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBCUIST+= -lmsvcrt +STDLIBGUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBGUIMT+= -lmsvcrt -lmingwthrd +STDLIBCUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDLIBCUIMT+= -lmsvcrt -lmingwthrd +STDSHLGUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLGUIST+= -lmsvcrt -lcrtdll +STDSHLCUIST=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLCUIST+= -lmsvcrt -lcrtdll +STDSHLGUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLGUIMT+= -lmsvcrt -lcrtdll -lmingwthrd +STDSHLCUIMT=-lmingw32 -lgcc -lmoldname $(UWINAPILIB) -lm -lkernel32 -luser32 +STDSHLCUIMT+= -lmsvcrt -lcrtdll -lmingwthrd + +LIBSTLPORT=-lstlport_gcc $(STDLIBCPP) +LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP) + +ADVAPI32LIB=-ladvapi32 +SHELL32LIB=-lshell32 +GDI32LIB=-lgdi32 +OLE32LIB=-lole32 +OLEAUT32LIB=-loleaut32 +UUIDLIB=-luuid +WINSPOOLLIB=-lwinspool +IMM32LIB=-limm32 +PSPLIB=-lpsp$(VERSION)$(DLLPOSTFIX) +VERSIONLIB=-lversion +WINMMLIB=-lwinmm +WSOCK32LIB=-lwsock32 +MPRLIB=-lmpr +WS2_32LIB=-lws2_32 +UNICOWSLIB=-lunicows +KERNEL32LIB=-lkernel32 +USER32LIB=-luser32 +MSVCRTLIB=-lmsvcrt +COMDLG32LIB=-lcomdlg32 +COMCTL32LIB=-lcomctl32 +DBGHELPLIB=-ldbghelp +PSAPILIB=-lpsapi -LIBMGR=ar +LIBMGR=$(WRAPCMD) ar LIBFLAGS=-rsu -IMPLIB=ld +IMPLIB=$(WRAPCMD) ld IMPLIBFLAGS= -MAPSYM=tmapsym +MAPSYM=$(WRAPCMD) tmapsym MAPSYMFLAGS= -RC=rc -RCFLAGS=-DWIN32 -fo$@ $(RCFILES) +RC=$(WRAPCMD) rc +RCFLAGS=-D__MINGW32__ -DWIN32 -D_WIN32_IE=0x400 -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 --- --- oo_1.1.1_src/solenv/inc/libs.mk.orig 2004-01-10 03:59:10.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/libs.mk 2004-03-29 12:17:40.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,15 +76,27 @@ ICUUCLIB=-licuuc I18NUTILLIB=-li18nutil$(COMID) .IF "$(WITH_GPC)"!="NO" +.IF "$(GUI)$(COM)"=="WNTGCC" +GPC3RDLIB=-lgpc_static +.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) CONNECTIVITYLIB=-lconnectivity LDAPBERLIB=-lldapber +.IF "$(GUI)"=="WNT" +TOOLSLIBST=-latools_static +.ELSE TOOLSLIBST=-latools +.ENDIF DVOSUTILLIBST=-ldvosutil DUNOUTILLIBST=-ldunoutil DVCLUTILLIBST=-ldvclutil @@ -95,7 +107,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 +128,11 @@ SALTLSLIB=-lsaltls$(UDK_MAJOR) SALZIPLIB=-lsalzip$(UDK_MAJOR) RMCXTLIB=-lrmcxt +.IF "$(GUI)$(COM)"=="WNTGCC" +BTSTRPLIB=-lbtstrp_static +.ELSE BTSTRPLIB=-lbtstrp +.ENDIF TRANSEXLIB=-ltransex IOTXLIB= OTXLIB=-lotx_ind @@ -124,27 +144,36 @@ USRLIB=-lusr$(OFFICEUPD)$(DLLPOSTFIX) SOTLIB=-lsot$(OFFICEUPD)$(DLLPOSTFIX) ONELIB=-lone$(OFFICEUPD)$(DLLPOSTFIX) -MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC) +MOZBASELIBST=-lnspr4 -lxpcombase_s MOZBASELIB=-lnspr4 -lxpcom 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 VCLLIBST=-lvcl VCLLIB=$(SVLIB) FREETYPELIB=-lfreetype -FREETYPELIBST=$(STATIC) -lfreetype $(DYNAMIC) +FREETYPELIBST=-lfreetype XPLIB=-l_xp TKLIB=-ltk$(OFFICEUPD)$(DLLPOSTFIX) SVTOOLLIB=-lsvt$(OFFICEUPD)$(DLLPOSTFIX) AUTOMATIONLIB=-lsts$(OFFICEUPD)$(DLLPOSTFIX) SVLLIB=-lsvl$(OFFICEUPD)$(DLLPOSTFIX) SVMEMLIB= +.IF "$(GUI)$(COM)"=="WNTGCC" +SVUNZIPLIB=-lsvunzip_static +SVUNZIPDLL=-lunzipdll_static +.ELSE SVUNZIPLIB=-lsvunzip SVUNZIPDLL=-lzip$(OFFICEUPD)$(DLLPOSTFIX) +.ENDIF PLUGCTORLIB=-lplugctor # PLUGCTORLIB= SO2LIB=-lso$(OFFICEUPD)$(DLLPOSTFIX) @@ -171,15 +200,29 @@ HM2LIBST=-lhmwrap LINGULIB=$(HM2LIBST) LNGLIB=-llng$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)$(COM)"=="WNTGCC" +EXPAT3RDLIB=-lexpat_xmlparse_static -lexpat_xmltok_static +EXPATASCII3RDLIB=-lascii_expat_xmlparse_static -lexpat_xmltok_static +.ELSE EXPAT3RDLIB=-lexpat_xmlparse -lexpat_xmltok EXPATASCII3RDLIB=-lascii_expat_xmlparse -lexpat_xmltok +.ENDIF .IF "$(SYSTEM_ZLIB)"=="YES" ZLIB3RDLIB=-lz .ELSE +.IF "$(GUI)$(COM)"=="WNTGCC" +ZLIB3RDLIB=-lzlib_static +.ELSE ZLIB3RDLIB=-lzlib .ENDIF +.ENDIF +.IF "$(GUI)$(COM)"=="WNTGCC" +JPEG3RDLIB=-ljpeglib_static +NEON3RDLIB=-lneon_static +.ELSE JPEG3RDLIB=-ljpeglib NEON3RDLIB=-lneon +.ENDIF BERKELEYLIB=-ldb-3.2 BERKELEYCPPLIB=-ldb_cxx-3.2 CURLLIB=-lcurl @@ -189,15 +232,27 @@ FWELIB=-lfwe$(OFFICEUPD)$(DLLPOSTFIX) FWILIB=-lfwi$(OFFICEUPD)$(DLLPOSTFIX) SVXLIB=-lsvx$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)$(COM)"=="WNTGCC" +SVXLIB+=-ldl$(OFFICEUPD)$(DLLPOSTFIX) +.ENDIF BASCTLLIB=-lbasctl$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)$(COM)"=="WNTGCC" +BASICIDELIB=-lybctl_static +.ELSE BASICIDELIB=-lybctl +.ENDIF SVXLLIB=-lsvxl CHAOSLIB=-lcnt$(OFFICEUPD)$(DLLPOSTFIX) UUILIB=-luui$(OFFICEUPD)$(DLLPOSTFIX) DGLIB= SIMLIB=-lysim +.IF "$(GUI)$(COM)"=="WNTGCC" +SCHLIB=-lysch_static +SMLIB=-lysm_static +.ELSE SCHLIB=-lysch SMLIB=-lysm +.ENDIF SBALIB=-lsbawrap #SBALIB=-lsba$(OFFICEUPD)$(DLLPOSTFIX) OFALIB=-lofa$(OFFICEUPD)$(DLLPOSTFIX) @@ -209,14 +264,45 @@ TRACERLIB=-ltrc$(OFFICEUPD)$(DLLPOSTFIX) PAPILIB=-lpap$(OFFICEUPD)$(DLLPOSTFIX) TRCLIB=$(TRACERLIB) +.IF "$(GUI)$(COM)"=="WNTGCC" +SCLIB=-lsclib_static +SDLIB=-lsdlib_static +.ELSE SCLIB=-lsclib SDLIB=-lsdlib +.ENDIF SDLLIB=-lsdl -SWLIB=-lswlib PKGCHKLIB=-lpkgchk$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)$(COM)"=="WNTGCC" +SWLIB=-lswlib_static +SYSSHELLLIB=-lsysshell_static +SABLOT3RDLIB=-lsablot_static +APP3RDLIB=-lapp_static +SAMPLE3RDLIB=-lsample_static +HNJLIB=-lhnj_static +MYSPELLLIB=-lmyspell_static +COSVLIB=-lcosv_static +UDMLIB=-ludm_static +.ELSE +SWLIB=-lswlib SYSSHELLLIB=-lsysshell +SABLOT3RDLIB=-lsablot +APP3RDLIB=-lapp +SAMPLE3RDLIB=-lsample +HNJLIB=-lhnj +MYSPELLLIB=-lmyspell +COSVLIB=-lcosv +UDMLIB=-ludm +.ENDIF SSOOPTLIB=-lssoopt$(OFFICEUPD)$(DLLPOSTFIX) +.IF "$(GUI)"=="WNT" +JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID) +.ELSE JVMACCESSLIB = -ljvmaccess$(COMID) +.ENDIF +ULINGULIB=-lulingu$(UPD)$(DLLPOSTFIX) +PYUNOLIB=-lpyuno +PYTHONLIB=-lpython # # USED_%NAME%_LIBS @@ -369,8 +455,18 @@ FREETYPELIBST=freetype.lib PKGCHKLIB=$(LIBPRE) ipkgchk.lib SYSSHELLLIB=sysshell.lib +SABLOT3RDLIB=sablot.lib +APP3RDLIB=app.lib +SAMPLE3RDLIB=sample.lib +HNJLIB=libhnj.lib +MYSPELLLIB=libmyspell.lib +COSVLIB=cosv.lib +UDMLIB=udm.lib SSOOPTLIB=issoopt$(OFFICEUPD)$(DLLPOSTFIX).lib JVMACCESSLIB = $(LIBPRE) ijvmaccess.lib +ULINGULIB=$(LIBPRE) ulingu.lib +PYUNOLIB=ipyuno.lib +PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib .ENDIF # "$(GUI)"=="UNX" || "$(GUI)"=="MAC" --- oo_1.1.1_src/solenv/inc/comdef.h.orig 2004-03-13 22:01:54.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/comdef.h 2004-03-13 19:32:24.000000000 +0900 @@ -0,0 +1,127 @@ +#ifndef __COMDEF_H__ +#ifdef __MINGW32__ +#include +#include +#include + +template +class CComPtr +{ +public: + CComPtr() + { + p=NULL; + } + ~CComPtr() + { + if (p) + p->Release(); + } + CComPtr(const CComPtr& lp) + { + if ((p = lp.p) != NULL) + p->AddRef(); + } + CComPtr(T* lp) + { + if ((p = lp) != NULL) + p->AddRef(); + } + T* operator=(const CComPtr& lp) + { + return assign(lp.p); + } + T* operator=(T* lp) + { + return assign(lp); + } + bool operator!() const + { + return (p == NULL); + } + operator T*() const + { + return p; + } + T* operator->() const + { + return p; + } + T** operator&() + { + return &p; + } +private: + T* assign(T* lp) + { + if (lp != NULL) + lp->AddRef(); + if (p) + p->Release(); + return p = lp; + } + bool operator==(T* pT) const + { + return p == pT; + } + T* p; +}; +#define __uuidof(I) IID_##I +typedef CComPtr< IMalloc > IMallocPtr; +typedef CComPtr< IShellFolder > IShellFolderPtr; +typedef CComPtr< IDataObject > IDataObjectPtr; +typedef CComPtr< IStream > IStreamPtr; +typedef CComPtr< IEnumFORMATETC > IEnumFORMATETCPtr; +class _com_error { +public: + // Constructors + // + _com_error(HRESULT hr, + IErrorInfo* perrinfo = NULL, + bool fAddRef = false) throw(); + _com_error(const _com_error& that) throw(); + + // Destructor + // + virtual ~_com_error() throw(); + + // Assignment operator + // + _com_error& operator=(const _com_error& that) throw(); + + // Accessors + // + HRESULT Error() const throw() { return m_hresult; } + WORD WCode() const throw(); + IErrorInfo * ErrorInfo() const throw(); + + // IErrorInfo method accessors + // +// _bstr_t Description() const throw(_com_error); + DWORD HelpContext() const throw(); +// _bstr_t HelpFile() const throw(_com_error); +// _bstr_t Source() const throw(_com_error); +// GUID GUID() const throw(); + + // FormatMessage accessors + const TCHAR * ErrorMessage() const throw(); + + // EXCEPINFO.wCode <-> HRESULT mappers + static HRESULT WCodeToHRESULT(WORD wCode) throw(); + static WORD HRESULTToWCode(HRESULT hr) throw(); + +private: + enum { + WCODE_HRESULT_FIRST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x200), + WCODE_HRESULT_LAST = MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF+1, 0) - 1 + }; + const HRESULT m_hresult; + IErrorInfo * m_perrinfo; + mutable TCHAR * m_pszMsg; +}; +#else +#include <../include/comdef.h> +#endif +#define __COMDEF_H__ +#endif + --- oo_1.1.1_src/solenv/inc/winres.h.orig 2004-03-13 22:01:54.000000000 +0900 +++ oo_1.1.1_src/solenv/inc/winres.h 2004-03-13 19:32:24.000000000 +0900 @@ -0,0 +1,13 @@ +#ifndef _WINRES_H +#define _WINRES_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#define VS_VERSION_INFO 1 +#include +#ifdef IDC_STATIC +#undef IDC_STATIC +#endif +#define IDC_STATIC (-1) +#endif --- oo_1.1.1_src/solenv/bin/getcompver.awk.orig 2003-07-02 22:42:36.000000000 +0900 +++ oo_1.1.1_src/solenv/bin/getcompver.awk 2004-03-29 12:17:40.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 } --- oo_1.1.1_src/solenv/bin/guw.pl.orig 2003-07-02 22:42:50.000000000 +0900 +++ oo_1.1.1_src/solenv/bin/guw.pl 2004-03-29 12:17:40.000000000 +0900 @@ -110,11 +110,11 @@ chomp( $d2 = qx{cygpath -w "$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 ( $variable =~ /\A(-\w([\w]+=)?)[\'\"]?((?:\/[\w\.\-\+ ~]+)+\/?)[\'\"]?\Z/ ) { # Include paths (sometimes with "/" at the end) + # This regex: option -> $1, filename without quotes -> $3 if ( defined $debug ) { print(STDERR "WinFormat:\ninclude path:\n$variable\n");}; $d1_prefix = $1; - $d1 = $2; + $d1 = $3; # Some programs (e.g. rsc have problems with filenames with spaces), use short dos paths if ( $d1 =~ / / ) { chomp( $d1 = qx{cygpath -d "$d1"} ); @@ -195,7 +195,7 @@ # remove .exe and convert to lower case $shortcommand = lc $command ; $shortcommand =~ s/\.exe$//; - $shortcommand =~ /(\w+$)/; + $shortcommand =~ /([^\/]+$)/; $shortcommand = $1; foreach $i (@{$knownpara{$shortcommand}}) { if( $para =~ /$i/ ) { @@ -258,10 +258,15 @@ { replace_cyg_env; } + if ( $command eq "-noshowcommand" ) + { + $noshowcommand = 1; + } $command = shift(@params); } -print( STDERR "Command: $command\n" ); +if (!defined $noshowcommand) + { print( STDERR "Command: $command\n" ); } replace_cyg(\@params); if ( (defined $debug_light) or (defined $debug) ) { print(STDERR "\n---------------------\nExecute: $command @params\n----------------\n");};