equal
deleted
inserted
replaced
261 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG |
261 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG |
262 LOCALDEFINES=%(LOCAL_DEFINES) |
262 LOCALDEFINES=%(LOCAL_DEFINES) |
263 |
263 |
264 |
264 |
265 PACKAGE=$(MODULE):$(MODULE_DIR) |
265 PACKAGE=$(MODULE):$(MODULE_DIR) |
266 STCLOCALOPT=-I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) -H. ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG) |
266 STCLOCALOPT=-I. $(LOCALINCLUDES) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) %(HEADEROUTPUTARG) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG) |
267 |
267 |
268 |
268 |
269 # ********** OPTIONAL: MODIFY the next line *** |
269 # ********** OPTIONAL: MODIFY the next line *** |
270 # additional C-libraries that should be pre-linked with the class-objects |
270 # additional C-libraries that should be pre-linked with the class-objects |
271 LD_OBJ_LIBS= |
271 LD_OBJ_LIBS= |
441 !!INCLUDE Make.spec |
441 !!INCLUDE Make.spec |
442 |
442 |
443 LOCALINCLUDES=%(LOCAL_INCLUDES) |
443 LOCALINCLUDES=%(LOCAL_INCLUDES) |
444 |
444 |
445 PACKAGE=$(MODULE):$(MODULE_DIR) |
445 PACKAGE=$(MODULE):$(MODULE_DIR) |
446 STCLOCALOPT=-I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG) |
446 STCLOCALOPT=-I. $(LOCALINCLUDES) %(HEADEROUTPUTARG) $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' %(COMMONSYMFLAG) |
447 RESFILES=%(RESFILENAME) |
447 RESFILES=%(RESFILENAME) |
448 |
448 |
449 ALL:: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll |
449 ALL:: $(LIBDIR)\$(LIBNAME).lib $(BINDIR)\$(LIBNAME).dll |
450 |
450 |
451 !!INCLUDE $(TOP)\rules\stdRules_nt |
451 !!INCLUDE $(TOP)\rules\stdRules_nt |
528 at: #'TOP' put: ( self unixPathToTop ); |
528 at: #'TOP' put: ( self unixPathToTop ); |
529 at: #'SUBDIRECTORIES' put: [self generateSubDirectories]; |
529 at: #'SUBDIRECTORIES' put: [self generateSubDirectories]; |
530 at: #'LOCAL_INCLUDES' put: [self generateUnixLocalIncludes]; |
530 at: #'LOCAL_INCLUDES' put: [self generateUnixLocalIncludes]; |
531 at: #'LOCAL_DEFINES' put: ''; |
531 at: #'LOCAL_DEFINES' put: ''; |
532 at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag); |
532 at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag); |
|
533 at: #'HEADEROUTPUTARG' put: (self headerFileOutputArg); |
533 yourself |
534 yourself |
534 |
535 |
535 "Created: / 09-08-2006 / 11:20:45 / fm" |
536 "Created: / 09-08-2006 / 11:20:45 / fm" |
536 "Modified: / 09-08-2006 / 16:44:48 / fm" |
537 "Modified: / 09-08-2006 / 16:44:48 / fm" |
537 "Modified: / 18-08-2006 / 12:59:05 / cg" |
538 "Modified: / 18-08-2006 / 12:59:05 / cg" |
541 |d| |
542 |d| |
542 |
543 |
543 d := super make_dot_spec_mappings. |
544 d := super make_dot_spec_mappings. |
544 d |
545 d |
545 at: #'LIBRARY_NAME' put: ( self libraryName ); |
546 at: #'LIBRARY_NAME' put: ( self libraryName ); |
546 at: #'OBJECTS' put: [self generateObjects_make_dot_spec]. |
547 at: #'OBJECTS' put: [self generateObjects_make_dot_spec]; |
|
548 yourself. |
547 ^ d |
549 ^ d |
548 |
550 |
549 "Created: / 09-08-2006 / 11:21:06 / fm" |
551 "Created: / 09-08-2006 / 11:21:06 / fm" |
550 "Modified: / 18-08-2006 / 11:45:18 / cg" |
552 "Modified: / 18-08-2006 / 11:45:18 / cg" |
551 ! |
553 ! |
568 |
570 |
569 d := super nt_dot_mak_mappings. |
571 d := super nt_dot_mak_mappings. |
570 d |
572 d |
571 at: #'LOCAL_INCLUDES' put: [self generateMsdosLocalIncludes]; |
573 at: #'LOCAL_INCLUDES' put: [self generateMsdosLocalIncludes]; |
572 at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag); |
574 at: #'COMMONSYMFLAG' put: (self commonSymbolsFlag); |
573 at: #'RESFILENAME' put: resFileName. |
575 at: #'HEADEROUTPUTARG' put: (self headerFileOutputArg); |
|
576 at: #'RESFILENAME' put: resFileName; |
|
577 yourself. |
574 ^ d. |
578 ^ d. |
575 |
579 |
576 "Created: / 09-08-2006 / 11:44:36 / fm" |
580 "Created: / 09-08-2006 / 11:44:36 / fm" |
577 "Modified: / 09-08-2006 / 20:00:01 / fm" |
581 "Modified: / 09-08-2006 / 20:00:01 / fm" |
578 "Modified: / 18-08-2006 / 17:20:25 / cg" |
582 "Modified: / 18-08-2006 / 17:20:25 / cg" |
766 DapasX_Datenbasis generateLocalIncludes |
770 DapasX_Datenbasis generateLocalIncludes |
767 " |
771 " |
768 |
772 |
769 "Created: / 09-08-2006 / 16:46:49 / fm" |
773 "Created: / 09-08-2006 / 16:46:49 / fm" |
770 "Modified: / 18-08-2006 / 11:58:45 / cg" |
774 "Modified: / 18-08-2006 / 11:58:45 / cg" |
|
775 ! |
|
776 |
|
777 headerFileOutputArg |
|
778 "all stx stuff goes to the common include directory. |
|
779 Everything else is left locally" |
|
780 |
|
781 ( |
|
782 #( |
|
783 'stx:libbasic' 'stx:libview' 'stx:libtool' |
|
784 'stx:libbasic2' 'stx:libview2' 'stx:libtool2' |
|
785 'stx:libbasic3' 'stx:libwidg' 'stx:libhtml' |
|
786 'stx:libcomp' 'stx:libwidg2' 'stx:libui' |
|
787 ) |
|
788 includes:self package) ifTrue:[ |
|
789 ^ '-H$(INCLUDE)' |
|
790 ]. |
|
791 ^ '-H.' |
|
792 |
|
793 "Created: / 18-08-2006 / 13:01:52 / cg" |
771 ! ! |
794 ! ! |
772 |
795 |
773 !LibraryDefinition class methodsFor:'sanity checks'! |
796 !LibraryDefinition class methodsFor:'sanity checks'! |
774 |
797 |
775 searchForInconsistencies |
798 searchForInconsistencies |
916 ! ! |
939 ! ! |
917 |
940 |
918 !LibraryDefinition class methodsFor:'documentation'! |
941 !LibraryDefinition class methodsFor:'documentation'! |
919 |
942 |
920 version |
943 version |
921 ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.27 2006-08-18 17:15:42 cg Exp $' |
944 ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.28 2006-08-18 17:19:39 cg Exp $' |
922 ! ! |
945 ! ! |