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 320... Line 320...
320
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(cc_includes)))) \
320
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(cc_includes)))) \
321
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(vc_includes))))
321
		$(subst $(spacealt),$(space),$(patsubst %,"-I%",$(subst /,\,$(vc_includes))))
322
cc_term		=
322
cc_term		=
323
 
323
 
324
define cc_pre
324
define cc_pre
325
	@$(echo) [$<] Compiling..
325
	@$(echo) '[$<] Compiling..'
326
endef
326
endef
327
 
327
 
328
	# Note:  The compiler gets the case of the PDB file
328
	# Note:  The compiler gets the case of the PDB file
329
	#        wrong, force to be mixed case.  Also generating of the
329
	#        wrong, force to be mixed case.  Also generating of the
330
	#        PDB image is optional based on debugging options, must
330
	#        PDB image is optional based on debugging options, must
Line 418... Line 418...
418
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(cxx_includes)))) \
418
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(cxx_includes)))) \
419
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(vc_includes))))
419
		$(subst $(spacealt),$(space),$(patsubst %,-I"%",$(subst /,\,$(vc_includes))))
420
cxx_term	=
420
cxx_term	=
421
 
421
 
422
define cxx_pre
422
define cxx_pre
423
	@echo [$<] compiling..
423
	@echo '[$<] compiling..'
424
endef
424
endef
425
 
425
 
426
define cxx_post
426
define cxx_post
427
endef
427
endef
428
 
428
 
Line 457... Line 457...
457
endif
457
endif
458
as_defines	:= $(addprefix /D,$(as_defines))
458
as_defines	:= $(addprefix /D,$(as_defines))
459
as_defines	+= $(ml_flags)
459
as_defines	+= $(ml_flags)
460
 
460
 
461
define as_pre
461
define as_pre
462
	@$(cmdfile) -wko$(as_cmdfile) "\
462
	$(AA_PRE)$(cmdfile) -wko$(as_cmdfile) "\
463
		$(patsubst %,%\\n,$(ASFLAGS)) \
463
		$(patsubst %,%\\n,$(ASFLAGS)) \
464
		$(patsubst %,%\\n,$(as_defines)) \
464
		$(patsubst %,%\\n,$(as_defines)) \
465
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(INCLUDES))) \
465
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(INCLUDES))) \
466
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(as_includes)))";\
466
		$(patsubst %,$(as_i_switch)%\\n,$(subst /,\\\\,$(as_includes)))";\
467
	        $(call show_cmdfile,$(as_cmdfile))
467
	        $(call show_cmdfile,$(as_cmdfile))
Line 496... Line 496...
496
ar_flags	+= $(patsubst %,-name:%,$(LIBNAME))
496
ar_flags	+= $(patsubst %,-name:%,$(LIBNAME))
497
ar_o_switch	= -out:$(subst /,\\,$@) $(subst /,\\,$(filter %.obj,$^)) $(subst /,\\,$(filter %.res,$^))
497
ar_o_switch	= -out:$(subst /,\\,$@) $(subst /,\\,$(filter %.obj,$^)) $(subst /,\\,$(filter %.res,$^))
498
ar_term		=
498
ar_term		=
499
 
499
 
500
define ar_pre
500
define ar_pre
501
	echo [$@] Building library ..;
501
	echo '[$@] Building library ..';
502
endef
502
endef
503
 
503
 
504
define ar_post
504
define ar_post
505
endef
505
endef
506
 
506
 
Line 512... Line 512...
512
armerge_cmdfile =
512
armerge_cmdfile =
513
armerge_flags	= -d $(MLIBDIR) -t MSVC
513
armerge_flags	= -d $(MLIBDIR) -t MSVC
514
armerge_o_switch= $(subst /,\\,$@) $(subst /,\\,$^)
514
armerge_o_switch= $(subst /,\\,$@) $(subst /,\\,$^)
515
 
515
 
516
define armerge_pre
516
define armerge_pre
517
	-echo [$@] Merging library ..; $(rm) -f $@
517
	-echo '[$@] Merging library ..'; $(rm) -f $@
518
endef
518
endef
519
armerge_post	=
519
armerge_post	=
520
 
520
 
521
###############################################################################
521
###############################################################################
522
#..     Linker
522
#..     Linker
Line 545... Line 545...
545
shld_flags	=
545
shld_flags	=
546
shld_o_switch	= @$(shld_cmdfile)
546
shld_o_switch	= @$(shld_cmdfile)
547
shld_term	=
547
shld_term	=
548
 
548
 
549
define shld_pre
549
define shld_pre
550
	@$(cmdfile) -wkWeo$(shld_cmdfile) \
550
	$(AA_PRE)$(cmdfile) -wkWeo$(shld_cmdfile) \
551
		"$(vc_ldflags) $($(notdir $(SHBASE))_shld)"; \
551
		"$(vc_ldflags) $($(notdir $(SHBASE))_shld)"; \
552
	echo [$@] Linking shared library ..;\
552
	echo '[$@] Linking shared library ..';\
553
        $(call show_cmdfile,$(shld_cmdfile))
553
        $(call show_cmdfile,$(shld_cmdfile))
554
endef
554
endef
555
 
555
 
556
ifndef LEAVETMP
556
ifndef LEAVETMP
557
define shld_post
557
define shld_post
Line 561... Line 561...
561
define shld_post
561
define shld_post
562
endef
562
endef
563
endif
563
endif
564
 
564
 
565
define SHLDDEPEND
565
define SHLDDEPEND
566
	@$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
566
	$(AA_PRE)$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
567
endef
567
endef
568
 
568
 
569
#..      Application
569
#..      Application
570
#
570
#
571
 
571
 
Line 574... Line 574...
574
ld_flags	=
574
ld_flags	=
575
ld_o_switch	= @$(ld_cmdfile)
575
ld_o_switch	= @$(ld_cmdfile)
576
ld_term		=
576
ld_term		=
577
 
577
 
578
define ld_pre
578
define ld_pre
579
	@$(cmdfile) -wkWeo$(ld_cmdfile) \
579
	$(AA_PRE)$(cmdfile) -wkWeo$(ld_cmdfile) \
580
		"$(vc_ldflags) $($(notdir $(basename $@))_ld)"; \
580
		"$(vc_ldflags) $($(notdir $(basename $@))_ld)"; \
581
	echo [$@] Linking application ..;\
581
	echo '[$@] Linking application ..';\
582
        $(call show_cmdfile,$(ld_cmdfile))
582
        $(call show_cmdfile,$(ld_cmdfile))
583
endef
583
endef
584
 
584
 
585
ifndef LEAVETMP
585
ifndef LEAVETMP
586
define ld_post
586
define ld_post
Line 590... Line 590...
590
define ld_post
590
define ld_post
591
endef
591
endef
592
endif
592
endif
593
 
593
 
594
define LDDEPEND
594
define LDDEPEND
595
	@$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
595
	$(AA_PRE)$(cmdfile) -wkWeo$(@) "$($(DPLIST))"
596
endef
596
endef
597
 
597
 
598
#.. Resource Compiler
598
#.. Resource Compiler
599
#   Convert a .rc file into a .res file
599
#   Convert a .rc file into a .res file
600
#       Set up the INCLUDE envar to conatin the path to locate required
600
#       Set up the INCLUDE envar to conatin the path to locate required
Line 610... Line 610...
610
rc_dirs += $(vc_includes)
610
rc_dirs += $(vc_includes)
611
rc_include = $(subst $(spacealt),$(space),$(subst $(space),$(empty),$(patsubst %,%;,$(subst /,\,$(rc_dirs)))))
611
rc_include = $(subst $(spacealt),$(space),$(subst $(space),$(empty),$(patsubst %,%;,$(subst /,\,$(rc_dirs)))))
612
rc_include1 = $(subst \;,;,$(rc_include))
612
rc_include1 = $(subst \;,;,$(rc_include))
613
 
613
 
614
define RC
614
define RC
615
	@$(echo) [$@] Compile Resource File ..
615
	@$(echo) '[$@] Compile Resource File ..'
616
	@$(show_environment)
616
	@$(show_environment)
617
	$(XX_PRE) export INCLUDE; INCLUDE="$(rc_include1)"; \
617
	$(XX_PRE) export INCLUDE; INCLUDE="$(rc_include1)"; \
618
	RC /l 0xC09 $(rc_defines) /fo $(subst /,\\,$@) $(subst /,\\,$<)
618
	RC /l 0xC09 $(rc_defines) /fo $(subst /,\\,$@) $(subst /,\\,$<)
619
endef
619
endef
620
 
620
 
621
#.. Browser Information
621
#.. Browser Information
622
#   Create a .BSC file from many .SBR files
622
#   Create a .BSC file from many .SBR files
623
#   Filter out non .SBR files to assist in rule creation
623
#   Filter out non .SBR files to assist in rule creation
624
#
624
#
625
define BSCMAKE
625
define BSCMAKE
626
	@$(echo) [$@] Create Source Browser Information ..
626
	@$(echo) '[$@] Create Source Browser Information ..'
627
	@$(show_environment)
627
	@$(show_environment)
628
	$(XX_PRE) bscmake -nologo -n -o $(subst /,\\,$@) $(subst /,\\,$(filter %.sbr,$^))
628
	$(XX_PRE) bscmake -nologo -n -o $(subst /,\\,$@) $(subst /,\\,$(filter %.sbr,$^))
629
endef
629
endef
630
 
630
 
631
#
631
#