Check-in [8a6eff5535]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix to put options at the end [[b43daab457]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8a6eff5535baeba2c5014d398105cbb2e25237b7
User & Date: jim 2012-10-12 16:19:06
References
2012-10-12
16:20 Fixed ticket [b43daab457]: Change the make file to put the lnk options at the end plus 4 other changes artifact: b116efdfaa user: jim
Context
2013-01-29
19:09
[194767860a] Had text line with no cmt check-in: 08a24d0ece user: jim tags: trunk
2012-10-12
16:19
Fix to put options at the end [[b43daab457] check-in: 8a6eff5535 user: jim tags: trunk
2012-08-11
11:27
Update to handle [632b9cc629] check-in: e0da51283c user: jim tags: trunk
Changes

Changes to CMaker.cp.

880
881
882
883
884
885
886

887
888
889
890
891
892
893
...
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015



1016
1017
1018
1019
1020
1021
1022
*			cc_opt		- Compiler options
*			linker		- Linker name
*			link_opt	- Linker options
*
*	OUTPUT:	TRUE if makefile OK, FALSE if not
*
*  13-Oct-2006 Change here to specify object file lcn

*
***********************************************************************/

bool CMaker::build_make( char *id,
						char *compiler,char *cc_opt,
						char *linker,char *link_opt, 
						char *bin_dir)
................................................................................
		}
        fl = fl->next;
    }
    fprintf(make,"\n");			// Terminate the section
								// NOTE: Remove extra LF between this and 
								// compile line REF:JS03112006

    fprintf(make,"\t$(LINKER) $(LNK_OPTIONS) \\\n");// REF:JS06032004 alone on line
    fl = cfiles;

	// Loop for all the o files
	
    while( fl != NULL )
    {
		if( target_files->check(fl->name))
		{
			fprintf(make,"\t\t%s/%s.o\\\n",obj,fl->name);
		}
        fl = fl->next;
    }
	
	// Put in the output line
	
    fprintf(make,"\t\t-o %s\n",pgmid->name);



    
	// (3.1) Insert 'clean'
	// REF:JS13102006 Add in OBJ file lcn
	
	fprintf(make,"\nclean : \n");
	fprintf(make,"\t\trm \\\n");
	fl = cfiles;







>







 







|













|

|
>
>
>







880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
...
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
*			cc_opt		- Compiler options
*			linker		- Linker name
*			link_opt	- Linker options
*
*	OUTPUT:	TRUE if makefile OK, FALSE if not
*
*  13-Oct-2006 Change here to specify object file lcn
*  12-Oct-2012 Change to put the lnk options at the end
*
***********************************************************************/

bool CMaker::build_make( char *id,
						char *compiler,char *cc_opt,
						char *linker,char *link_opt, 
						char *bin_dir)
................................................................................
		}
        fl = fl->next;
    }
    fprintf(make,"\n");			// Terminate the section
								// NOTE: Remove extra LF between this and 
								// compile line REF:JS03112006

    fprintf(make,"\t$(LINKER) \\\n");// REF:JS06032004 alone on line
    fl = cfiles;

	// Loop for all the o files
	
    while( fl != NULL )
    {
		if( target_files->check(fl->name))
		{
			fprintf(make,"\t\t%s/%s.o\\\n",obj,fl->name);
		}
        fl = fl->next;
    }
	
	// Put in the output line & the options [b43daab457]
	
    fprintf(make,"\t\t-o %s\\\n",pgmid->name);;
	fprintf(make,"\t\t$(LNK_OPTIONS)\n\n");
	fprintf(make,"\t\t--- End of Link---\n");
	
    
	// (3.1) Insert 'clean'
	// REF:JS13102006 Add in OBJ file lcn
	
	fprintf(make,"\nclean : \n");
	fprintf(make,"\t\trm \\\n");
	fl = cfiles;

Changes to pbtomake.xcodeproj/project.xcworkspace/xcuserdata/jim.xcuserdatad/UserInterfaceState.xcuserstate.

cannot compute difference between binary files