Subversion Repositories DevTools

Rev

Rev 4928 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4928 Rev 6177
Line 298... Line 298...
298
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(cc_includes)))) \
298
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(cc_includes)))) \
299
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(vc_includes))))
299
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(vc_includes))))
300
cc_term		=
300
cc_term		=
301
 
301
 
302
define cc_pre
302
define cc_pre
303
	@$(echo) [$<] Compiling..
303
	@$(echo) '[$<] Compiling..'
304
endef
304
endef
305
 
305
 
306
	# Note:  The compiler gets the case of the PDB file
306
	# Note:  The compiler gets the case of the PDB file
307
	#        wrong, force to be mixed case.  Also generating of the
307
	#        wrong, force to be mixed case.  Also generating of the
308
	#        PDB image is optional based on debugging options, must
308
	#        PDB image is optional based on debugging options, must
Line 397... Line 397...
397
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(cxx_includes)))) \
397
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(cxx_includes)))) \
398
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(vc_includes))))
398
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(vc_includes))))
399
cxx_term	=
399
cxx_term	=
400
 
400
 
401
define cxx_pre
401
define cxx_pre
402
	@echo [$<] compiling..
402
	@echo '[$<] compiling..'
403
endef
403
endef
404
 
404
 
405
define cxx_post
405
define cxx_post
406
endef
406
endef
407
 
407
 
Line 436... Line 436...
436
endif
436
endif
437
as_defines	:= $(addprefix /D,$(as_defines))
437
as_defines	:= $(addprefix /D,$(as_defines))
438
as_defines	+= $(ml_flags)
438
as_defines	+= $(ml_flags)
439
 
439
 
440
define as_pre
440
define as_pre
441
	@$(cmdfile) -wko$(as_cmdfile) "\
441
	$(AA_PRE)$(cmdfile) -wko$(as_cmdfile) "\
442
		$(patsubst %,%\\n,$(ASFLAGS)) \
442
		$(patsubst %,%\\n,$(ASFLAGS)) \
443
		$(patsubst %,%\\n,$(as_defines)) \
443
		$(patsubst %,%\\n,$(as_defines)) \
444
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(INCLUDES))) \
444
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(INCLUDES))) \
445
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(as_includes)))";\
445
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(as_includes)))";\
446
	        $(call show_cmdfile,$(as_cmdfile))
446
	        $(call show_cmdfile,$(as_cmdfile))
Line 475... Line 475...
475
ar_flags	+= $(patsubst %,-name:%,$(LIBNAME))
475
ar_flags	+= $(patsubst %,-name:%,$(LIBNAME))
476
ar_o_switch	= -out:$(subst /,\\,$@) $(subst /,\\,$(filter %.obj,$^)) $(subst /,\\,$(filter %.res,$^))
476
ar_o_switch	= -out:$(subst /,\\,$@) $(subst /,\\,$(filter %.obj,$^)) $(subst /,\\,$(filter %.res,$^))
477
ar_term		=
477
ar_term		=
478
 
478
 
479
define ar_pre
479
define ar_pre
480
	echo [$@] Building library ..;
480
	echo '[$@] Building library ..';
481
endef
481
endef
482
 
482
 
483
define ar_post
483
define ar_post
484
endef
484
endef
485
 
485
 
Line 491... Line 491...
491
armerge_cmdfile =
491
armerge_cmdfile =
492
armerge_flags	= -d $(MLIBDIR) -t MSVC
492
armerge_flags	= -d $(MLIBDIR) -t MSVC
493
armerge_o_switch= $(subst /,\\,$@) $(subst /,\\,$^)
493
armerge_o_switch= $(subst /,\\,$@) $(subst /,\\,$^)
494
 
494
 
495
define armerge_pre
495
define armerge_pre
496
	-echo [$@] Merging library ..; $(rm) -f $@
496
	-echo '[$@] Merging library ..'; $(rm) -f $@
497
endef
497
endef
498
armerge_post	=
498
armerge_post	=
499
 
499
 
500
###############################################################################
500
###############################################################################
501
#..     Linker
501
#..     Linker
Line 524... Line 524...
524
shld_flags	=
524
shld_flags	=
525
shld_o_switch	= @$(shld_cmdfile)
525
shld_o_switch	= @$(shld_cmdfile)
526
shld_term	=
526
shld_term	=
527
 
527
 
528
define shld_pre
528
define shld_pre
529
	@$(cmdfile) -wkWeo$(shld_cmdfile) \
529
	$(AA_PRE)$(cmdfile) -wkWeo$(shld_cmdfile) \
530
		"$(vc_ldflags) $($(notdir $(SHBASE))_shld)"; \
530
		"$(vc_ldflags) $($(notdir $(SHBASE))_shld)"; \
531
	echo [$@] Linking shared library ..;\
531
	echo '[$@] Linking shared library ..';\
532
        $(call show_cmdfile,$(shld_cmdfile))
532
        $(call show_cmdfile,$(shld_cmdfile))
533
endef
533
endef
534
 
534
 
535
ifndef LEAVETMP
535
ifndef LEAVETMP
536
define shld_post
536
define shld_post
Line 540... Line 540...
540
define shld_post
540
define shld_post
541
endef
541
endef
542
endif
542
endif
543
 
543
 
544
define SHLDDEPEND
544
define SHLDDEPEND
545
	@$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
545
	$(AA_PRE)$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
546
endef
546
endef
547
 
547
 
548
#..      Application
548
#..      Application
549
#
549
#
550
 
550
 
Line 553... Line 553...
553
ld_flags	=
553
ld_flags	=
554
ld_o_switch	= @$(ld_cmdfile)
554
ld_o_switch	= @$(ld_cmdfile)
555
ld_term		=
555
ld_term		=
556
 
556
 
557
define ld_pre
557
define ld_pre
558
	@$(cmdfile) -wkWeo$(ld_cmdfile) \
558
	$(AA_PRE)$(cmdfile) -wkWeo$(ld_cmdfile) \
559
		"$(vc_ldflags) $($(notdir $(basename $@))_ld)"; \
559
		"$(vc_ldflags) $($(notdir $(basename $@))_ld)"; \
560
	echo [$@] Linking application ..;\
560
	echo '[$@] Linking application ..';\
561
        $(call show_cmdfile,$(ld_cmdfile))
561
        $(call show_cmdfile,$(ld_cmdfile))
562
endef
562
endef
563
 
563
 
564
ifndef LEAVETMP
564
ifndef LEAVETMP
565
define ld_post
565
define ld_post
Line 569... Line 569...
569
define ld_post
569
define ld_post
570
endef
570
endef
571
endif
571
endif
572
 
572
 
573
define LDDEPEND
573
define LDDEPEND
574
	@$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
574
	$(AA_PRE)$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
575
endef
575
endef
576
 
576
 
577
#.. Resource Compiler
577
#.. Resource Compiler
578
#   Convert a .rc file into a .res file
578
#   Convert a .rc file into a .res file
579
#       Set up the INCLUDE envar to conatin the path to locate required
579
#       Set up the INCLUDE envar to conatin the path to locate required
Line 589... Line 589...
589
rc_dirs += $(vc_includes)
589
rc_dirs += $(vc_includes)
590
rc_include = $(subst $(spacealt),$(space),$(subst $(space),$(empty),$(patsubst %,%;,$(subst /,\,$(rc_dirs)))))
590
rc_include = $(subst $(spacealt),$(space),$(subst $(space),$(empty),$(patsubst %,%;,$(subst /,\,$(rc_dirs)))))
591
rc_include1 = $(subst \;,;,$(rc_include))
591
rc_include1 = $(subst \;,;,$(rc_include))
592
 
592
 
593
define RC
593
define RC
594
	@$(echo) [$@] Compile Resource File ..
594
	@$(echo) '[$@] Compile Resource File ..'
595
	@$(show_environment)
595
	@$(show_environment)
596
	$(XX_PRE) export INCLUDE; INCLUDE="$(rc_include1)"; \
596
	$(XX_PRE) export INCLUDE; INCLUDE="$(rc_include1)"; \
597
	RC /l 0xC09 $(rc_defines) /fo $(subst /,\\,$@) $(subst /,\\,$<)
597
	RC /l 0xC09 $(rc_defines) /fo $(subst /,\\,$@) $(subst /,\\,$<)
598
endef
598
endef
599
 
599
 
600
#.. Browser Information
600
#.. Browser Information
601
#   Create a .BSC file from many .SBR files
601
#   Create a .BSC file from many .SBR files
602
#   Filter out non .SBR files to assist in rule creation
602
#   Filter out non .SBR files to assist in rule creation
603
#
603
#
604
define BSCMAKE
604
define BSCMAKE
605
	@$(echo) [$@] Create Source Browser Information ..
605
	@$(echo) '[$@] Create Source Browser Information ..'
606
	@$(show_environment)
606
	@$(show_environment)
607
	$(XX_PRE) bscmake -nologo -n -o $(subst /,\\,$@) $(subst /,\\,$(filter %.sbr,$^))
607
	$(XX_PRE) bscmake -nologo -n -o $(subst /,\\,$@) $(subst /,\\,$(filter %.sbr,$^))
608
endef
608
endef
609
 
609
 
610
#
610
#