diff --git a/make/tail.mk b/make/tail.mk index 133315f..a3db053 100644 --- a/make/tail.mk +++ b/make/tail.mk @@ -10,6 +10,7 @@ DISKIMAGE=$(PGM).2mg BUILDTARGET=$(DISKIMAGE) EXECTARGET=executeGUI DISKIMAGEDEST=. +AUXTYPE= ifeq ($(TARGETTYPE),shell) FILETYPE=exe @@ -17,6 +18,7 @@ ifeq ($(TARGETTYPE),shell) BUILDTARGET=$(PGM) else ifeq ($(TARGETTYPE),desktop) FILETYPE=s16 + AUXTYPE=-a 0x0000db03 else ifeq ($(TARGETTYPE),cda) FILETYPE=cda DISKIMAGEDEST=System/Desk.Accs @@ -107,7 +109,7 @@ ifneq ($(REZ_OBJS),) $(CP) $(REZ_OBJS) $(PGM) endif $(LINK) $(LDFLAGS) $(BUILD_OBJS_NOSUFFIX) --keep=$(PGM) - $(CHTYP) -t $(FILETYPE) $(PGM) + $(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(PGM) else @@ -123,7 +125,7 @@ $(REZ_OBJS): $(BINTARGET) $(PGM): $(REZ_OBJS) $(RM) $(PGM) $(CP) $(REZ_OBJS) $(PGM) - $(CHTYP) -t $(FILETYPE) $(PGM) + $(CHTYP) -t $(FILETYPE) $(AUXTYPE) $(PGM) endif diff --git a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez index 3bf09c5..36f48b8 100644 --- a/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAC Control Panel.xctemplate/main.rez @@ -12,6 +12,20 @@ #include "___FILEBASENAME___.h" +resource rVersion (1) { + { + 0, /* Major version number in BCD */ + 1, /* Minor version number in BCD */ + 0, /* Bug version number in BCD */ + development,/* Development phase */ + 0 /* Release number */ + }, + verUS, + "___PROJECTNAME___", + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___" +}; + + /* This is the required resource to tell the control panel about the CDev */ resource rCDEVFlags (CDEV_RESOURCE) { 0x00C0, /* This sets the wantCreate and wantAbout bits */ @@ -23,7 +37,7 @@ resource rCDEVFlags (CDEV_RESOURCE) { {0, 0, 110, 200}, "___PROJECTNAME___", "___FULLUSERNAME___", - "1.0" + "0.1" }; diff --git a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.rez index 8481352..50ec025 100644 --- a/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAC Desktop Application.xctemplate/main.rez @@ -11,6 +11,20 @@ #include "___FILEBASENAME___.h" +resource rVersion (1) { + { + 0, /* Major version number in BCD */ + 1, /* Minor version number in BCD */ + 0, /* Bug version number in BCD */ + development,/* Development phase */ + 0 /* Release number */ + }, + verUS, + "___PROJECTNAME___", + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___" +}; + + resource rMenuBar (menuBar) { { appleMenu, @@ -176,12 +190,19 @@ resource rPString (appleAbout, noCrossBank) {"About ___PROJECTNAME___..."}; resource rAlertString (aboutAlertString) { - "43/" + "0" /* Custom size */ + "\$38\$00" /* Upper Y coordinate at 56 */ + "\$90\$00" /* Left X coordinate at 144 */ + "\$90\$00" /* Lower Y coorinate at 144 */ + "\$F0\$01" /* Right X coordinate at 496 */ + "3/" "___PROJECTNAME___\n" " by ___FULLUSERNAME___\n" "\n" - "Contains libraries from ORCA C,\n" - "Copyright 1991, Byte Works Inc." + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___ Rand\n" + "\n" + "Contains libraries from ORCAC,\n" + "Copyright \$A9 1991, Byte Works Inc." "/^#0\$00"; }; @@ -191,7 +212,7 @@ resource rWindParam1 (windowRes) { nil, /* wTitle */ 0, /* wRefCon */ {0, 0, 0, 0}, /* ZoomRect */ - nil, /* wColor ID */ + $07FF0001, /* wColor ID */ {0, 0}, /* Origin */ {1, 1}, /* data size */ {0, 0}, /* max height-width */ @@ -202,7 +223,7 @@ resource rWindParam1 (windowRes) { {30, 10, 183, 602}, /* wposition */ infront, /* wPlane */ nil, /* wStorage */ - $0000 /* wInVerb */ + $0800 /* wInVerb */ }; diff --git a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.h b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.h index 7e8bdb1..0a291e3 100644 --- a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.h +++ b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.h @@ -11,8 +11,6 @@ #define _GUARD_PROJECT___PROJECTNAMEASIDENTIFIER____FILE___FILEBASENAMEASIDENTIFIER____ -#define linedColors 1 - #define windowRes 1001 diff --git a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.rez index fdbdb0e..f904995 100644 --- a/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAC New Desk Accessory.xctemplate/main.rez @@ -12,12 +12,26 @@ #include "___FILEBASENAME___.h" +resource rVersion (1) { + { + 0, /* Major version number in BCD */ + 1, /* Minor version number in BCD */ + 0, /* Bug version number in BCD */ + development,/* Development phase */ + 0 /* Release number */ + }, + verUS, + "___PROJECTNAME___", + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___" +}; + + resource rWindParam1 (windowRes) { $C0A5, /* wFrameBits */ nil, /* wTitle */ 0, /* wRefCon */ {0,0,0,0}, /* ZoomRect */ - linedColors, /* wColor ID */ + $07FF0001, /* wColor ID */ {0,0}, /* Origin */ {0,0}, /* data size */ {0,0}, /* max height-width */ @@ -32,10 +46,3 @@ resource rWindParam1 (windowRes) { }; -resource rWindColor (linedColors) { - 0x0000, /* frameColor */ - 0x0F00, /* titleColor */ - 0x020F, /* tbarColor */ - 0xF0F0, /* growColor */ - 0x00F0, /* infoColor */ -}; diff --git a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/main.rez index 0c79861..3568b60 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAM Control Panel.xctemplate/main.rez @@ -15,6 +15,20 @@ #define HELP_RESOURCE 0x101 +resource rVersion (1) { + { + 0, /* Major version number in BCD */ + 1, /* Minor version number in BCD */ + 0, /* Bug version number in BCD */ + development,/* Development phase */ + 0 /* Release number */ + }, + verUS, + "___PROJECTNAME___", + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___" +}; + + /* This is the required resource to tell the control panel about the CDev */ resource rCDEVFlags (CDEV_RESOURCE) { 0x00C0, /* This sets the wantCreate and wantAbout bits */ @@ -26,7 +40,7 @@ resource rCDEVFlags (CDEV_RESOURCE) { {0, 0, 110, 200}, "___PROJECTNAME___", "___FULLUSERNAME___", - "1.0" + "0.1" }; diff --git a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez index 74a2b70..f107723 100644 --- a/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAM Desktop Application.xctemplate/main.rez @@ -36,6 +36,20 @@ #define toolStartup 1 +resource rVersion (1) { + { + 0, /* Major version number in BCD */ + 1, /* Minor version number in BCD */ + 0, /* Bug version number in BCD */ + development,/* Development phase */ + 0 /* Release number */ + }, + verUS, + "___PROJECTNAME___", + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___" +}; + + resource rMenuBar (menuBar) { { appleMenu, @@ -201,12 +215,19 @@ resource rPString (appleAbout, noCrossBank) {"About ___PROJECTNAME___..."}; resource rAlertString (aboutAlertString) { - "43/" + "0" /* Custom size */ + "\$38\$00" /* Upper Y coordinate at 56 */ + "\$90\$00" /* Left X coordinate at 144 */ + "\$90\$00" /* Lower Y coorinate at 144 */ + "\$F0\$01" /* Right X coordinate at 496 */ + "3/" "___PROJECTNAME___\n" " by ___FULLUSERNAME___\n" "\n" - "Contains libraries from ORCA M,\n" - "Copyright 1991, Byte Works Inc." + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___ Rand\n" + "\n" + "Contains libraries from ORCAC,\n" + "Copyright \$A9 1991, Byte Works Inc." "/^#0\$00"; }; @@ -216,7 +237,7 @@ resource rWindParam1 (windowRes) { nil, /* wTitle */ 0, /* wRefCon */ {0, 0, 0, 0}, /* ZoomRect */ - nil, /* wColor ID */ + $07FF0001, /* wColor ID */ {0, 0}, /* Origin */ {1, 1}, /* data size */ {0, 0}, /* max height-width */ @@ -227,7 +248,7 @@ resource rWindParam1 (windowRes) { {30, 10, 183, 602}, /* wposition */ infront, /* wPlane */ nil, /* wStorage */ - $0000 /* wInVerb */ + $0800 /* wInVerb */ }; diff --git a/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/main.rez b/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/main.rez index c7695d5..d264aad 100644 --- a/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/main.rez +++ b/pkg/Templates/Apple IIgs/ORCAM New Desk Accessory.xctemplate/main.rez @@ -11,7 +11,20 @@ #define windowRes 1001 -#define linedColors 1 + + +resource rVersion (1) { + { + 0, /* Major version number in BCD */ + 1, /* Minor version number in BCD */ + 0, /* Bug version number in BCD */ + development,/* Development phase */ + 0 /* Release number */ + }, + verUS, + "___PROJECTNAME___", + "Copyright \$A9 ___YEAR___ ___FULLUSERNAME___" +}; resource rWindParam1 (windowRes) { @@ -19,7 +32,7 @@ resource rWindParam1 (windowRes) { nil, /* wTitle */ 0, /* wRefCon */ {0,0,0,0}, /* ZoomRect */ - linedColors, /* wColor ID */ + $07FF0001, /* wColor ID */ {0,0}, /* Origin */ {0,0}, /* data size */ {0,0}, /* max height-width */ @@ -32,12 +45,3 @@ resource rWindParam1 (windowRes) { nil, /* wStorage */ $0800 /* wInVerb */ }; - - -resource rWindColor (linedColors) { - 0x0000, /* frameColor */ - 0x0F00, /* titleColor */ - 0x020F, /* tbarColor */ - 0xF0F0, /* growColor */ - 0x00F0, /* infoColor */ -};