Skip to content

Commit 4a8574e

Browse files
wine make.exe works correctly now (but of course no executables)
1 parent d6f2df7 commit 4a8574e

File tree

1 file changed

+20
-15
lines changed

1 file changed

+20
-15
lines changed

src/example_makefile

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,17 @@ ifeq ($(OS),Windows_NT)
2323
NATIVEPATH = $(subst /,\,$(1))
2424
WINPATH = $(NATIVEPATH)
2525
WINRELPATH = $(subst /,\,$(1))
26+
WINCHKDIR = if not exist $(1)
2627
RM = del /q /f 2>nul
2728
CEDEV ?= $(call NATIVEPATH,$(realpath ..\..))
28-
BIN = $(CEDEV)/bin
29+
BIN ?= $(call NATIVEPATH,$(CEDEV)/bin)
2930
AS = $(call NATIVEPATH,$(BIN)/ez80asm.exe)
3031
LD = $(call NATIVEPATH,$(BIN)/ez80link.exe)
3132
CC = $(call NATIVEPATH,$(BIN)/ez80cc.exe)
3233
CD = cd
3334
CP = copy /Y
35+
CV = $(call NATIVEPATH,$(BIN)/convhex.exe)
36+
PG = $(call NATIVEPATH,$(BIN)/convpng.exe)
3437
NULL = >nul 2>&1
3538
RMDIR = rmdir /s /q
3639
MKDIR = mkdir
@@ -41,15 +44,15 @@ WINPATH = $(subst \,\\,$(shell winepath --windows $(1)))
4144
WINRELPATH = $(subst /,\,$(1))
4245
RM = rm --force
4346
CEDEV ?= $(call NATIVEPATH,$(realpath ..\..))
44-
BIN = $(CEDEV)/bin
47+
BIN ?= $(call NATIVEPATH,$(CEDEV)/bin)
4548
AS = $(call NATIVEPATH,wine $(BIN)/ez80asm.exe)
4649
LD = $(call NATIVEPATH,wine $(BIN)/ez80link.exe)
4750
CC = $(call NATIVEPATH,wine $(BIN)/ez80cc.exe)
4851
CD = cd
4952
CP = cp
5053
CV = $(call NATIVEPATH,$(BIN)/convhex)
5154
PG = $(call NATIVEPATH,$(BIN)/convpng)
52-
NULL = >nul 2>&1
55+
NULL =
5356
RMDIR = rm -rf
5457
MKDIR = mkdir -p
5558
chain := ;
@@ -73,7 +76,7 @@ LIBHEADER_OBJ := $(LIBHEADER_ASM:%.asm=%.obj)
7376

7477

7578
#Find all the directories in the source input
76-
ALLDIRS := $(call NATIVEPATH,$(sort $(dir $(wildcard $(SRCDIR)/*/))))
79+
ALLDIRS := $(sort $(dir $(wildcard $(SRCDIR)/*/)))
7780

7881
#Determine if output should be archived or compressed
7982
ifeq ($(ARCHIVED),YES)
@@ -217,11 +220,20 @@ LDFLAGS := \
217220

218221
ifneq ($(OS),Windows_NT)
219222
LDFLAGS := '$(LDFLAGS)'
223+
else
224+
WINCHKBINDIR := $(WINCHKDIR)$(BINDIR)
225+
WINCHKOBJDIR := $(WINCHKDIR)$(OBJDIR)
220226
endif
221227

222228
#This rule is trigged to build everything
223-
all: $(BINDIR) $(OBJDIR) $(BINDIR)/$(TARGET8XP)
224-
229+
all: add_dirs $(BINDIR)/$(TARGET8XP)
230+
@echo "Finished."
231+
232+
add_dirs:
233+
@$(WINCHKBINDIR) $(MKDIR) $(BINDIR)
234+
@$(WINCHKOBJDIR) $(MKDIR) $(OBJDIR)
235+
@echo "Looking for changes..."
236+
225237
$(BINDIR)/$(TARGET8XP): $(BINDIR)/$(TARGETHEX)
226238
$(CD) $(BINDIR) $(chain) \
227239
$(CV) $(CVFLAGS) $(notdir $<)
@@ -230,13 +242,6 @@ $(BINDIR)/$(TARGETHEX): $(CSTARTUPOBJ) $(LIBHOBJ) $(OBJECTS)
230242
echo C CE SDK Version $(VERSION)
231243
$(LD) $(LDFLAGS) $@ = "$(subst $(space),$(comma),$(call WINRELPATH,$^) $(LOBJECTS) $(LIBRARIES))"
232244

233-
$(OBJDIR):
234-
echo $(OBJECTS)
235-
$(MKDIR) $(OBJDIR)
236-
237-
$(BINDIR):
238-
$(MKDIR) $(BINDIR)
239-
240245
#This rule handles conversion of the icon, if it is ever updated
241246
$(OBJDIR)/$(ICON_OBJ): $(ICONPNG)
242247
$(ICON_CONV) $(chain) \
@@ -274,5 +279,5 @@ clean:
274279
version:
275280
@echo C SDK Version $(VERSION)
276281

277-
.PHONY: all clean version
278-
282+
.PHONY: all clean version add_dirs
283+

0 commit comments

Comments
 (0)