From e54c22fdda1ff2f654d115693b777ce410b4ae6a Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Thu, 6 May 2021 23:43:31 -0400 Subject: [PATCH] Add more to the makefiles to support building both the shell command and the babelfish translator which is the next step in supporting markdown. --- md2teach.xcodeproj/project.pbxproj | 44 +++++-- md2teach/Makefile | 183 ++--------------------------- md2teach/babelfish.mk | 182 ++++++++++++++++++++++++++++ md2teach/make/head.mk | 4 +- md2teach/make/tail.mk | 5 + md2teach/shell.mk | 178 ++++++++++++++++++++++++++++ md2teach/{ => shell}/io.c | 6 +- md2teach/{ => shell}/io.h | 0 md2teach/{ => shell}/main.c | 6 +- md2teach/{ => shell}/main.h | 0 md2teach/{ => shell}/style.c | 6 +- md2teach/{ => shell}/style.h | 0 md2teach/{ => shell}/translate.c | 8 +- md2teach/{ => shell}/translate.h | 0 14 files changed, 422 insertions(+), 200 deletions(-) create mode 100644 md2teach/babelfish.mk create mode 100644 md2teach/shell.mk rename md2teach/{ => shell}/io.c (99%) rename md2teach/{ => shell}/io.h (100%) rename md2teach/{ => shell}/main.c (97%) rename md2teach/{ => shell}/main.h (100%) rename md2teach/{ => shell}/style.c (99%) rename md2teach/{ => shell}/style.h (100%) rename md2teach/{ => shell}/translate.c (99%) rename md2teach/{ => shell}/translate.h (100%) diff --git a/md2teach.xcodeproj/project.pbxproj b/md2teach.xcodeproj/project.pbxproj index c16f3d1..b7f2533 100644 --- a/md2teach.xcodeproj/project.pbxproj +++ b/md2teach.xcodeproj/project.pbxproj @@ -8,7 +8,7 @@ /* Begin PBXBuildFile section */ 9D6532ED2626240800105D50 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 9D6532EC2626240800105D50 /* main.c */; }; - 9D6532EF2626240800105D50 /* Makefile in Sources */ = {isa = PBXBuildFile; fileRef = 9D6532EE2626240800105D50 /* Makefile */; }; + 9D6532EF2626240800105D50 /* shell.mk in Sources */ = {isa = PBXBuildFile; fileRef = 9D6532EE2626240800105D50 /* shell.mk */; }; 9D6532F22626240800105D50 /* head.mk in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D6532F12626240800105D50 /* head.mk */; }; 9D6532F42626240800105D50 /* orca-asm in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D6532F32626240800105D50 /* orca-asm */; }; 9D6532F62626240800105D50 /* orca-cc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9D6532F52626240800105D50 /* orca-cc */; }; @@ -40,10 +40,12 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 9D406AA12644E8CF00747EE9 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9D406AB12644EB6500747EE9 /* babelfish.mk */ = {isa = PBXFileReference; lastKnownFileType = text; path = babelfish.mk; sourceTree = ""; }; 9D6532E42626240800105D50 /* md2teach */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = md2teach; sourceTree = BUILT_PRODUCTS_DIR; }; 9D6532EA2626240800105D50 /* doNotBuild */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = doNotBuild; sourceTree = BUILT_PRODUCTS_DIR; }; 9D6532EC2626240800105D50 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 9D6532EE2626240800105D50 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 9D6532EE2626240800105D50 /* shell.mk */ = {isa = PBXFileReference; lastKnownFileType = text; path = shell.mk; sourceTree = ""; }; 9D6532F12626240800105D50 /* head.mk */ = {isa = PBXFileReference; lastKnownFileType = text; path = head.mk; sourceTree = ""; }; 9D6532F32626240800105D50 /* orca-asm */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "orca-asm"; sourceTree = ""; }; 9D6532F52626240800105D50 /* orca-cc */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "orca-cc"; sourceTree = ""; }; @@ -82,6 +84,28 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 9D406A9C2644E80100747EE9 /* shell */ = { + isa = PBXGroup; + children = ( + 9D6532EC2626240800105D50 /* main.c */, + 9D8125DA2634A539002F05F5 /* main.h */, + 9D8125DB2634A584002F05F5 /* io.h */, + 9D8125DC2634A584002F05F5 /* io.c */, + 9D8125E22634AC4A002F05F5 /* translate.h */, + 9D8125E32634AC4A002F05F5 /* translate.c */, + 9D8125F12634B4D4002F05F5 /* style.h */, + 9D8125F22634B4D4002F05F5 /* style.c */, + ); + path = shell; + sourceTree = ""; + }; + 9D406AB02644EB4E00747EE9 /* babelfish */ = { + isa = PBXGroup; + children = ( + ); + path = babelfish; + sourceTree = ""; + }; 9D6532DD2626240800105D50 = { isa = PBXGroup; children = ( @@ -104,17 +128,13 @@ 9D6532EB2626240800105D50 /* md2teach */ = { isa = PBXGroup; children = ( - 9D6532EC2626240800105D50 /* main.c */, - 9D8125DA2634A539002F05F5 /* main.h */, - 9D8125DB2634A584002F05F5 /* io.h */, - 9D8125DC2634A584002F05F5 /* io.c */, - 9D8125E22634AC4A002F05F5 /* translate.h */, - 9D8125E32634AC4A002F05F5 /* translate.c */, - 9D8125F12634B4D4002F05F5 /* style.h */, - 9D8125F22634B4D4002F05F5 /* style.c */, + 9D406AA12644E8CF00747EE9 /* Makefile */, 9D65330C2626246700105D50 /* md4c.c */, 9D65330B2626246700105D50 /* md4c.h */, - 9D6532EE2626240800105D50 /* Makefile */, + 9D6532EE2626240800105D50 /* shell.mk */, + 9D406A9C2644E80100747EE9 /* shell */, + 9D406AB12644EB6500747EE9 /* babelfish.mk */, + 9D406AB02644EB4E00747EE9 /* babelfish */, 9DDFC7B42627E081006D6E71 /* test.md */, 9D6532F02626240800105D50 /* make */, 9D6532FB2626240800105D50 /* Supporting Files */, @@ -244,7 +264,7 @@ buildActionMask = 2147483647; files = ( 9D8125E42634AC4A002F05F5 /* translate.c in Sources */, - 9D6532EF2626240800105D50 /* Makefile in Sources */, + 9D6532EF2626240800105D50 /* shell.mk in Sources */, 9D8125DD2634A584002F05F5 /* io.c in Sources */, 9D8125F32634B4D4002F05F5 /* style.c in Sources */, 9D6532ED2626240800105D50 /* main.c in Sources */, diff --git a/md2teach/Makefile b/md2teach/Makefile index 2238eeb..ac66a27 100644 --- a/md2teach/Makefile +++ b/md2teach/Makefile @@ -3,176 +3,13 @@ # Apple //GS Build Engine for ORCA and Merlin # -include make/head.mk - -# Customize this file to control what kind of project you are working on, -# where to find files, etc. - -# The name of your system or binary file to build goes here: -PGM=md2teach - -# Set the target type you would like to build. The options are: -# shell - A shell command for ORCA, GNO or other GS shell -# desktop - A full desktop application -# cda - A classic desk accessory -# cdev - A control panel device -# nba - A HyperStudio new button action -# nda - A new desk accessory -# xcmd - A HyperCard XCMD or XCFN -# -TARGETTYPE=shell -# TARGETTYPE=desktop -# TARGETTYPE=cda -# TARGETTYPE=cdev -# TARGETTYPE=nba -# TARGETTYPE=nda -# TARGETTYPE=xcmd - -# Uncomment one of the following lines to force a particular GS emulator. -# By default, specific paths are tested for these emulators in the below -# order and the first found is what will be used. You can overrride that -# here: -# -# EMULATOR=gsplus -# EMULATOR=mame -# EMULATOR=gsport - -# By default, the build provides a single boot environment to test with. -# You can put other .2mg files into the make directory and override this -# variable to change what boot disk you want to use when you launch the -# emulator. The disk image you specify must be found in the make directory: -# -# BOOTIMAGE=system601.2mg - -# Add any other directories where you are putting C or assembly source -# files to this list: -# SRCDIRS+= - -# If you put your main entry point for your project in a file called main.c -# Then you don't need to change this value. If you want to call your entry -# point something other than main.c, set this variable to point to this file. -ROOTCFILE=main.c - -# Add any arguments you want passed to the C compiler to this variable: -CFLAGS+=+O - -# Add any arguments you want passed to the resource compiler to this variable: -REZFLAGS+= - -# Uncomment the following line if you have installed rlint as found here: -# https://github.com/ksherlock/rlint/releases -# Assuming that it is in the path that ORCA searches (the Utilities directory is -# probably a good choice), you can just leave the value unchanged. If you have -# put the rlint somewhere weird, you can set this to the correct path -# RLINT_PATH=rlint - -# Add any arguments you want passed to the macro generator to this variable: -MACGENFLAGS+= - -# Add any other macro libraries to include in this variable: -MACGENMACROS+= - -# Add any arguments you want passed to the assembler to this variable: -ASMFLAGS+= - -# Add any arguments you want passed to the linker to this variable: -LDFLAGS+= - -# Uncomment the following line if you want to build against the GNO libraries -# export ORCA=$(ORCA_BINDIR)/gno - -# If you want to copy one or more files or directories to the distribution disk -# image, add the root directory to this variable. Any directories under -# the source directory which don't exist in the target disk image will be -# created. All files will be copied from the source to the target using -# the same path from the source. -# -# For example, if you set COPYDIRS to dir and in your project you have -# the following files: -# dir/Icons/myIconFile -# dir/newDir/anotherFile -# Then, during the copy phase, myIconFile will be copied into the Icons -# folder and a folder newDir will be created and anotherFile will be copied -# into there. -COPYDIRS= - -# If you want to copy one or more files or directories to the boot disk -# image, add the root directory to this variable. Any directories under -# the source directory which don't exist in the boot disk image will be -# created. All files will be copied from the source to the target using -# the same path from the source. -# -# For example, if you set COPYBOOTDIRS to dir and in your project you have -# the following files: -# dir/System/mySystemFile -# dir/newDir/anotherFile -# Then, during the copy phase, mySystemFile will be copied into the System -# folder and a folder newDir will be created and anotherFile will be copied -# into there. -COPYBOOTDIRS= - -# By default, the build expects that you have GSplus in the path: -# /Applications/GSplus.app/Contents/MacOS/gsplus -# If you have it in a different location, specify that here. -# GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus - -# By default, the build uses no arguments with GSplus. If you would like to -# use different arguments, specify that here. -# GSPLUSARGS= - -# By default, the build expects that you have GSport in the path: -# /Applications/GSport/GSport.app/Contents/MacOS/GSport -# If you have it in a different location, specify that here. -# GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport - -# By default, the build uses no arguments with GSport. If you would like to -# use different arguments, specify that here. -# GSPORTARGS= - -# By default, the build expects that you have Ample/mame in the path: -# /Applications/Ample.app/Contents/MacOS/mame64 -# If you have it in a different location, specify that here. -# MAME=/Applications/Ample.app/Contents/MacOS/mame64 - -# By default, the build expects that you have the mame ROMs/libs in the path: -# $(HOME)/Library/Application Support/Ample -# If you have it in a different location, specify that here. -# MAMELIB=$(HOME)/Library/Application Support/Ample - -# By default, the build uses these arguments with mame: -# apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 -# If you would like to use different arguments, specify that here. -# MAMEARGS=apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 - -# For a desktop application, it can operate in 640x200 or 320x200 -# resolution. This setting is used to define which horizontal -# resolution you want to use for a desktop application. Other -# target types ignore this value. -# DESKTOP_RES_MODE=640 - -# For a desktop application, it can support opening and printing -# files based on paths sent to it by the message center. This -# option controls if that is or is not supported in the -# application (note: only the C desktop template supports message -# center today) -# MESSAGE_CENTER=0 - -# Add any rules you want to execute before any compiles or assembly -# commands are called here, if any. You can generate .c, .s or .h -# files for example. You can generate data files. Whatever you -# might need. You should generate these files in the $(GENDIR) -# directory or within a subdirectory under $(GENDIR) which you create -# yourself. -# -# All of your commands associated with a rule _must_ start with a tab -# character. Xcode makes it a bit tough to type a tab character by -# default. Press option-tab within Xcode to insert a tab character. -gen: - -# For any files you generated in the gen target above, you should -# add rules in genclean to remove those generated files when you -# clean your build. -genclean: - -# Do not change anything else below here... -include make/tail.mk +all: + make -f shell.mk + make -f babelfish.mk + +clean: + make -f shell.mk clean + make -f babelfish.mk clean + +execute: + make -f shell.mk execute diff --git a/md2teach/babelfish.mk b/md2teach/babelfish.mk new file mode 100644 index 0000000..abe121b --- /dev/null +++ b/md2teach/babelfish.mk @@ -0,0 +1,182 @@ +# +# Makefile +# Apple //GS Build Engine for ORCA and Merlin +# + +include make/head.mk + +# Customize this file to control what kind of project you are working on, +# where to find files, etc. + +# The name of your system or binary file to build goes here: +PGM=markdown + +# Set the target type you would like to build. The options are: +# shell - A shell command for ORCA, GNO or other GS shell +# desktop - A full desktop application +# cda - A classic desk accessory +# cdev - A control panel device +# nba - A HyperStudio new button action +# nda - A new desk accessory +# xcmd - A HyperCard XCMD or XCFN +# +# TARGETTYPE=shell +# TARGETTYPE=desktop +# TARGETTYPE=cda +# TARGETTYPE=cdev +# TARGETTYPE=nba +# TARGETTYPE=nda +# TARGETTYPE=xcmd +TARGETTYPE=babelfish + +# Uncomment one of the following lines to force a particular GS emulator. +# By default, specific paths are tested for these emulators in the below +# order and the first found is what will be used. You can overrride that +# here: +# +# EMULATOR=gsplus +# EMULATOR=mame +# EMULATOR=gsport + +# By default, the build provides a single boot environment to test with. +# You can put other .2mg files into the make directory and override this +# variable to change what boot disk you want to use when you launch the +# emulator. The disk image you specify must be found in the make directory: +# +# BOOTIMAGE=system601.2mg + +# Add any other directories where you are putting C or assembly source +# files to this list: +SRCDIRS+=babelfish + +# If you put your main entry point for your project in a file called main.c +# Then you don't need to change this value. If you want to call your entry +# point something other than main.c, set this variable to point to this file. +ROOTCFILE=shell/main.c + +# Add any arguments you want passed to the C compiler to this variable: +CFLAGS+=+O + +# Add any arguments you want passed to the resource compiler to this variable: +REZFLAGS+= + +# Uncomment the following line if you have installed rlint as found here: +# https://github.com/ksherlock/rlint/releases +# Assuming that it is in the path that ORCA searches (the Utilities directory is +# probably a good choice), you can just leave the value unchanged. If you have +# put the rlint somewhere weird, you can set this to the correct path +# RLINT_PATH=rlint + +# Add any arguments you want passed to the macro generator to this variable: +MACGENFLAGS+= + +# Add any other macro libraries to include in this variable: +MACGENMACROS+= + +# Add any arguments you want passed to the assembler to this variable: +ASMFLAGS+= + +# Add any arguments you want passed to the linker to this variable: +LDFLAGS+= + +# Uncomment the following line if you want to build against the GNO libraries +# export ORCA=$(ORCA_BINDIR)/gno + +# If you want to copy one or more files or directories to the distribution disk +# image, add the root directory to this variable. Any directories under +# the source directory which don't exist in the target disk image will be +# created. All files will be copied from the source to the target using +# the same path from the source. +# +# For example, if you set COPYDIRS to dir and in your project you have +# the following files: +# dir/Icons/myIconFile +# dir/newDir/anotherFile +# Then, during the copy phase, myIconFile will be copied into the Icons +# folder and a folder newDir will be created and anotherFile will be copied +# into there. +COPYDIRS= + +# If you want to copy one or more files or directories to the boot disk +# image, add the root directory to this variable. Any directories under +# the source directory which don't exist in the boot disk image will be +# created. All files will be copied from the source to the target using +# the same path from the source. +# +# For example, if you set COPYBOOTDIRS to dir and in your project you have +# the following files: +# dir/System/mySystemFile +# dir/newDir/anotherFile +# Then, during the copy phase, mySystemFile will be copied into the System +# folder and a folder newDir will be created and anotherFile will be copied +# into there. +COPYBOOTDIRS= + +# By default, the build expects that you have GSplus in the path: +# /Applications/GSplus.app/Contents/MacOS/gsplus +# If you have it in a different location, specify that here. +# GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus + +# By default, the build uses no arguments with GSplus. If you would like to +# use different arguments, specify that here. +# GSPLUSARGS= + +# By default, the build expects that you have GSport in the path: +# /Applications/GSport/GSport.app/Contents/MacOS/GSport +# If you have it in a different location, specify that here. +# GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport + +# By default, the build uses no arguments with GSport. If you would like to +# use different arguments, specify that here. +# GSPORTARGS= + +# By default, the build expects that you have Ample/mame in the path: +# /Applications/Ample.app/Contents/MacOS/mame64 +# If you have it in a different location, specify that here. +# MAME=/Applications/Ample.app/Contents/MacOS/mame64 + +# By default, the build expects that you have the mame ROMs/libs in the path: +# $(HOME)/Library/Application Support/Ample +# If you have it in a different location, specify that here. +# MAMELIB=$(HOME)/Library/Application Support/Ample + +# By default, the build uses these arguments with mame: +# apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 +# If you would like to use different arguments, specify that here. +# MAMEARGS=apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 + +# For a desktop application, it can operate in 640x200 or 320x200 +# resolution. This setting is used to define which horizontal +# resolution you want to use for a desktop application. Other +# target types ignore this value. +# DESKTOP_RES_MODE=640 + +# For a desktop application, it can support opening and printing +# files based on paths sent to it by the message center. This +# option controls if that is or is not supported in the +# application (note: only the C desktop template supports message +# center today) +# MESSAGE_CENTER=0 + +# Add any rules you want to execute before any compiles or assembly +# commands are called here, if any. You can generate .c, .s or .h +# files for example. You can generate data files. Whatever you +# might need. You should generate these files in the $(GENDIR) +# directory or within a subdirectory under $(GENDIR) which you create +# yourself. +# +# All of your commands associated with a rule _must_ start with a tab +# character. Xcode makes it a bit tough to type a tab character by +# default. Press option-tab within Xcode to insert a tab character. +gen: + +# For any files you generated in the gen target above, you should +# add rules in genclean to remove those generated files when you +# clean your build. +genclean: + +target: + true + +# Do not change anything else below here... +include make/tail.mk diff --git a/md2teach/make/head.mk b/md2teach/make/head.mk index a697081..b5ca0be 100644 --- a/md2teach/make/head.mk +++ b/md2teach/make/head.mk @@ -120,6 +120,6 @@ XCODE_PLUGIN_COMPATIBILITY=DVTPlugInCompatibilityUUID all: $(MKDIR) $(OBJDIR) $(GENDIR) $(TARGETDIR) - @make gen - @make build + @make -f $(firstword $(MAKEFILE_LIST)) gen + @make -f $(firstword $(MAKEFILE_LIST)) build diff --git a/md2teach/make/tail.mk b/md2teach/make/tail.mk index ce8448f..29093e6 100644 --- a/md2teach/make/tail.mk +++ b/md2teach/make/tail.mk @@ -48,6 +48,11 @@ else ifeq ($(TARGETTYPE),nda) else ifeq ($(TARGETTYPE),xcmd) FILETYPE=exe BUILDTARGET=$(TARGETDIR)/$(PGM) +else ifeq ($(TARGETTYPE),babelfish) + FILETYPE=0xbe + AUXTYPE=-a 0x4003 + BOOTCOPYPATH=System/SHS.Babelfish + BUILDTARGET=target endif diff --git a/md2teach/shell.mk b/md2teach/shell.mk new file mode 100644 index 0000000..a08cf7a --- /dev/null +++ b/md2teach/shell.mk @@ -0,0 +1,178 @@ +# +# Makefile +# Apple //GS Build Engine for ORCA and Merlin +# + +include make/head.mk + +# Customize this file to control what kind of project you are working on, +# where to find files, etc. + +# The name of your system or binary file to build goes here: +PGM=md2teach + +# Set the target type you would like to build. The options are: +# shell - A shell command for ORCA, GNO or other GS shell +# desktop - A full desktop application +# cda - A classic desk accessory +# cdev - A control panel device +# nba - A HyperStudio new button action +# nda - A new desk accessory +# xcmd - A HyperCard XCMD or XCFN +# +TARGETTYPE=shell +# TARGETTYPE=desktop +# TARGETTYPE=cda +# TARGETTYPE=cdev +# TARGETTYPE=nba +# TARGETTYPE=nda +# TARGETTYPE=xcmd + +# Uncomment one of the following lines to force a particular GS emulator. +# By default, specific paths are tested for these emulators in the below +# order and the first found is what will be used. You can overrride that +# here: +# +# EMULATOR=gsplus +# EMULATOR=mame +# EMULATOR=gsport + +# By default, the build provides a single boot environment to test with. +# You can put other .2mg files into the make directory and override this +# variable to change what boot disk you want to use when you launch the +# emulator. The disk image you specify must be found in the make directory: +# +# BOOTIMAGE=system601.2mg + +# Add any other directories where you are putting C or assembly source +# files to this list: +SRCDIRS+=shell + +# If you put your main entry point for your project in a file called main.c +# Then you don't need to change this value. If you want to call your entry +# point something other than main.c, set this variable to point to this file. +ROOTCFILE=shell/main.c + +# Add any arguments you want passed to the C compiler to this variable: +CFLAGS+=+O + +# Add any arguments you want passed to the resource compiler to this variable: +REZFLAGS+= + +# Uncomment the following line if you have installed rlint as found here: +# https://github.com/ksherlock/rlint/releases +# Assuming that it is in the path that ORCA searches (the Utilities directory is +# probably a good choice), you can just leave the value unchanged. If you have +# put the rlint somewhere weird, you can set this to the correct path +# RLINT_PATH=rlint + +# Add any arguments you want passed to the macro generator to this variable: +MACGENFLAGS+= + +# Add any other macro libraries to include in this variable: +MACGENMACROS+= + +# Add any arguments you want passed to the assembler to this variable: +ASMFLAGS+= + +# Add any arguments you want passed to the linker to this variable: +LDFLAGS+= + +# Uncomment the following line if you want to build against the GNO libraries +# export ORCA=$(ORCA_BINDIR)/gno + +# If you want to copy one or more files or directories to the distribution disk +# image, add the root directory to this variable. Any directories under +# the source directory which don't exist in the target disk image will be +# created. All files will be copied from the source to the target using +# the same path from the source. +# +# For example, if you set COPYDIRS to dir and in your project you have +# the following files: +# dir/Icons/myIconFile +# dir/newDir/anotherFile +# Then, during the copy phase, myIconFile will be copied into the Icons +# folder and a folder newDir will be created and anotherFile will be copied +# into there. +COPYDIRS= + +# If you want to copy one or more files or directories to the boot disk +# image, add the root directory to this variable. Any directories under +# the source directory which don't exist in the boot disk image will be +# created. All files will be copied from the source to the target using +# the same path from the source. +# +# For example, if you set COPYBOOTDIRS to dir and in your project you have +# the following files: +# dir/System/mySystemFile +# dir/newDir/anotherFile +# Then, during the copy phase, mySystemFile will be copied into the System +# folder and a folder newDir will be created and anotherFile will be copied +# into there. +COPYBOOTDIRS= + +# By default, the build expects that you have GSplus in the path: +# /Applications/GSplus.app/Contents/MacOS/gsplus +# If you have it in a different location, specify that here. +# GSPLUS=/Applications/GSplus.app/Contents/MacOS/gsplus + +# By default, the build uses no arguments with GSplus. If you would like to +# use different arguments, specify that here. +# GSPLUSARGS= + +# By default, the build expects that you have GSport in the path: +# /Applications/GSport/GSport.app/Contents/MacOS/GSport +# If you have it in a different location, specify that here. +# GSPORT=/Applications/GSport/GSport.app/Contents/MacOS/GSport + +# By default, the build uses no arguments with GSport. If you would like to +# use different arguments, specify that here. +# GSPORTARGS= + +# By default, the build expects that you have Ample/mame in the path: +# /Applications/Ample.app/Contents/MacOS/mame64 +# If you have it in a different location, specify that here. +# MAME=/Applications/Ample.app/Contents/MacOS/mame64 + +# By default, the build expects that you have the mame ROMs/libs in the path: +# $(HOME)/Library/Application Support/Ample +# If you have it in a different location, specify that here. +# MAMELIB=$(HOME)/Library/Application Support/Ample + +# By default, the build uses these arguments with mame: +# apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 +# If you would like to use different arguments, specify that here. +# MAMEARGS=apple2gs -skip_gameinfo -mouse -window -resolution 1408x1056 -ramsize 4M -sl7 cffa202 + +# For a desktop application, it can operate in 640x200 or 320x200 +# resolution. This setting is used to define which horizontal +# resolution you want to use for a desktop application. Other +# target types ignore this value. +# DESKTOP_RES_MODE=640 + +# For a desktop application, it can support opening and printing +# files based on paths sent to it by the message center. This +# option controls if that is or is not supported in the +# application (note: only the C desktop template supports message +# center today) +# MESSAGE_CENTER=0 + +# Add any rules you want to execute before any compiles or assembly +# commands are called here, if any. You can generate .c, .s or .h +# files for example. You can generate data files. Whatever you +# might need. You should generate these files in the $(GENDIR) +# directory or within a subdirectory under $(GENDIR) which you create +# yourself. +# +# All of your commands associated with a rule _must_ start with a tab +# character. Xcode makes it a bit tough to type a tab character by +# default. Press option-tab within Xcode to insert a tab character. +gen: + +# For any files you generated in the gen target above, you should +# add rules in genclean to remove those generated files when you +# clean your build. +genclean: + +# Do not change anything else below here... +include make/tail.mk diff --git a/md2teach/io.c b/md2teach/shell/io.c similarity index 99% rename from md2teach/io.c rename to md2teach/shell/io.c index f04739c..97793c0 100644 --- a/md2teach/io.c +++ b/md2teach/shell/io.c @@ -16,9 +16,9 @@ #include #include -#include "io.h" -#include "main.h" -#include "style.h" +#include "shell/io.h" +#include "shell/main.h" +#include "shell/style.h" // Defines diff --git a/md2teach/io.h b/md2teach/shell/io.h similarity index 100% rename from md2teach/io.h rename to md2teach/shell/io.h diff --git a/md2teach/main.c b/md2teach/shell/main.c similarity index 97% rename from md2teach/main.c rename to md2teach/shell/main.c index 983c9a3..d1b7c96 100644 --- a/md2teach/main.c +++ b/md2teach/shell/main.c @@ -11,9 +11,9 @@ #include #include -#include "io.h" -#include "main.h" -#include "translate.h" +#include "shell/io.h" +#include "shell/main.h" +#include "shell/translate.h" // GS_TODO - How big does the stack need to be? In looking over the code, diff --git a/md2teach/main.h b/md2teach/shell/main.h similarity index 100% rename from md2teach/main.h rename to md2teach/shell/main.h diff --git a/md2teach/style.c b/md2teach/shell/style.c similarity index 99% rename from md2teach/style.c rename to md2teach/shell/style.c index 0f832d9..7559723 100644 --- a/md2teach/style.c +++ b/md2teach/shell/style.c @@ -13,9 +13,9 @@ #include #include -#include "io.h" -#include "main.h" -#include "style.h" +#include "shell/io.h" +#include "shell/main.h" +#include "shell/style.h" // Defines diff --git a/md2teach/style.h b/md2teach/shell/style.h similarity index 100% rename from md2teach/style.h rename to md2teach/shell/style.h diff --git a/md2teach/translate.c b/md2teach/shell/translate.c similarity index 99% rename from md2teach/translate.c rename to md2teach/shell/translate.c index f337082..f913a00 100644 --- a/md2teach/translate.c +++ b/md2teach/shell/translate.c @@ -9,10 +9,10 @@ #include #include -#include "translate.h" -#include "io.h" -#include "main.h" -#include "style.h" +#include "shell/translate.h" +#include "shell/io.h" +#include "shell/main.h" +#include "shell/style.h" // Typedefs diff --git a/md2teach/translate.h b/md2teach/shell/translate.h similarity index 100% rename from md2teach/translate.h rename to md2teach/shell/translate.h