Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,12 @@ regress:
@echo "********** Building variant 'wheels'"
@$(MAKE) VARIANT=wheels all
./regress.sh wheels
@echo "********** Bulding apps"
@$(MAKE) -C apps regress

clean:
rm -rf build
$(MAKE) -C apps clean

ifeq ($(VARIANT),bsw128)
$(BUILD_DIR)/$(D64_RESULT): $(BUILD_DIR)/kernal_compressed.prg
Expand All @@ -311,18 +314,23 @@ $(BUILD_DIR)/$(D64_RESULT): $(BUILD_DIR)/kernal_compressed.prg
echo \*\*\* Created fresh $@.; \
fi;
else
$(BUILD_DIR)/$(D64_RESULT): $(BUILD_DIR)/kernal_compressed.prg
$(BUILD_DIR)/$(D64_RESULT): $(BUILD_DIR)/kernal_compressed.prg applications
@if [ -e $(D64_TEMPLATE) ]; then \
cp $(D64_TEMPLATE) $@; \
echo delete geos geoboot | $(C1541) $@ ;\
echo write $< geos | $(C1541) $@ ;\
echo delete geos geoboot | $(C1541) $@ >/dev/null ;\
echo write $< geos | $(C1541) $@ >/dev/null ;\
echo \*\*\* Created $@ based on $(D64_TEMPLATE).; \
else \
echo format geos,00 d64 $@ | $(C1541) >/dev/null; \
echo write $< geos | $(C1541) $@ >/dev/null; \
if [ -e $(DESKTOP_CVT) ]; then echo geoswrite $(DESKTOP_CVT) | $(C1541) $@; fi >/dev/null; \
echo \*\*\* Created fresh $@.; \
fi;
fi; \
if [ -e $(BUILD_DIR)/apps/configure.cvt ]; then \
echo delete configure | $(C1541) $@ >/dev/null; \
echo geoswrite $(BUILD_DIR)/apps/configure.cvt | $(C1541) $@ >/dev/null ; \
echo \*\*\* Wrote custom CONFIGURE $@.; \
fi
endif

$(BUILD_DIR)/kernal_compressed.prg: $(BUILD_DIR)/kernal_combined.prg
Expand Down Expand Up @@ -370,6 +378,13 @@ else
@mv $(BUILD_DIR)/tmp.bin $(BUILD_DIR)/kernal_combined.prg
endif

.EXPORT_ALL_VARIABLES:
export

applications: $(BUILD_DIR)/drv/drv1541.bin $(BUILD_DIR)/drv/drv1571.bin $(BUILD_DIR)/drv/drv1581.bin
@echo Creating apps
$(MAKE) -C apps

ifeq ($(VARIANT),bsw128)
INPUTCFG = input/inputdrv_bsw128.cfg
else
Expand Down
7 changes: 7 additions & 0 deletions apps/Configure V2.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*.o
*.cvt
*.map
*.lab
.*.swp
configure.hex
configure.diff
Loading