diff --git a/Loader_Apple2/disk.dsk b/Loader_Apple2/disk.dsk new file mode 100644 index 0000000..fb0d4d5 Binary files /dev/null and b/Loader_Apple2/disk.dsk differ diff --git a/Loader_Apple2/scripts/add-to-disk.sh b/Loader_Apple2/scripts/add-to-disk.sh new file mode 100644 index 0000000..a754ae3 --- /dev/null +++ b/Loader_Apple2/scripts/add-to-disk.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# Adds the required files to the provided disk.dsk +# usage: add_to_disk PATH_TO_APPLECOMMANDER.jar PATH_TO_BINARY.a2 PATH_TO_PICTURE PATH_TO_DISK + +set -e + +if (( $# != 4 )); then + echo "Bad number of arguments" + echo "usage: add_to_disk.sh PATH_TO_APPLECOMMANDER.jar PATH_TO_BINARY.a2 PATH_TO_PICTURE PATH_TO_DISK" + exit +fi + +echo " . revoving previous instance of DISPLAY form the disk" +java -jar ${1} -d ${4} DISPLAY + +echo " .. adding DISPLAY to the disk" +java -jar ${1} -cc65 ${4} DISPLAY BIN < ${2} + +echo " . revoving previous instance of PICTURE form the disk" +java -jar ${1} -d ${4} PICTURE + +# echo " .. adding PICTURE to the disk" +java -jar ${1} -cc65 ${4} PICTURE BIN < ${3} + +echo "DONE." diff --git a/Rgb2Hires_PC/projects/Tile/Tile.vcxproj b/Rgb2Hires_PC/projects/Tile/Tile.vcxproj index ec46349..ecac7d1 100644 --- a/Rgb2Hires_PC/projects/Tile/Tile.vcxproj +++ b/Rgb2Hires_PC/projects/Tile/Tile.vcxproj @@ -117,6 +117,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir)\src;$(MAGICK_HOME)\ImageMagick\Magick++\lib;$(MAGICK_HOME)\ImageMagick + Sync Console @@ -134,6 +135,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(SolutionDir)\src;$(MAGICK_HOME)\ImageMagick\Magick++\lib;$(MAGICK_HOME)\ImageMagick + Sync Console diff --git a/Rgb2Hires_PC/projects/libRgb2Hires/libRgb2Hires.vcxproj b/Rgb2Hires_PC/projects/libRgb2Hires/libRgb2Hires.vcxproj index d97c530..2a771c7 100644 --- a/Rgb2Hires_PC/projects/libRgb2Hires/libRgb2Hires.vcxproj +++ b/Rgb2Hires_PC/projects/libRgb2Hires/libRgb2Hires.vcxproj @@ -46,7 +46,7 @@ Unicode - Application + StaticLibrary false v142 true @@ -117,6 +117,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(MAGICK_HOME)\ImageMagick\Magick++\lib;$(MAGICK_HOME)\ImageMagick + Sync Console @@ -132,6 +133,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true $(MAGICK_HOME)\ImageMagick\Magick++\lib;$(MAGICK_HOME)\ImageMagick + Sync Console diff --git a/Rgb2Hires_PC/src/Common.h b/Rgb2Hires_PC/src/Common.h index a576c2c..b7e012d 100644 --- a/Rgb2Hires_PC/src/Common.h +++ b/Rgb2Hires_PC/src/Common.h @@ -23,18 +23,21 @@ #include +#define MAGICKCORE_ZERO_CONFIGURATION_SUPPORT 1 namespace RgbToHires { - static Magick::Color WHITE("white"); - static Magick::Color BLACK("black"); - static Magick::Color BLUE("blue"); - static Magick::Color GREEN("green"); - static Magick::Color ORANGE("orange"); - static Magick::Color VIOLET("purple"); - static constexpr unsigned WIDTH = 140u; - static constexpr unsigned HEIGHT = 192u; + #define WHITE Magick::Color{"white"} + #define BLACK Magick::Color{"black"} + #define BLUE Magick::Color{"blue"} + #define GREEN Magick::Color{"green"} + #define ORANGE Magick::Color{"orange"} + #define VIOLET Magick::Color{"purple"} + + + constexpr unsigned WIDTH = 140u; + constexpr unsigned HEIGHT = 192u; }