@@ -57,6 +57,7 @@ NULL = >nul 2>&1
57
57
RMDIR = rmdir /s /q
58
58
MKDIR = mkdir
59
59
else
60
+ MAKEDIR := $(CURDIR)
60
61
NATIVEPATH = $(subst \,/,$(1))
61
62
WINPATH = $(subst \,\\,$(shell winepath -w $(1)))
62
63
WINRELPATH = $(subst /,\,$(1))
@@ -179,7 +180,7 @@ SAFEMKDIR = $(MKDIR) $(call NATIVEPATH,$(1))
179
180
else
180
181
WINCHKBINDIR := $(WINCHKDIR) $(BINDIR)
181
182
WINCHKOBJDIR := $(WINCHKDIR) $(OBJDIR)
182
- SAFEMKDIR = $(WINCHKDIR) $(call NATIVEPATH,$(1)) $(MKDIR) $(call NATIVEPATH,$(1))
183
+ SAFEMKDIR = ( $(WINCHKDIR) $(call NATIVEPATH,$(1)) $(MKDIR) $(call NATIVEPATH,$(1) ))
183
184
endif
184
185
185
186
# this rule is trigged to build everything
@@ -209,14 +210,14 @@ $(OBJDIR)/$(ICON_ASM): $(ICONPNG)
209
210
210
211
# these rules compile the source files into object files
211
212
$(OBJDIR)/%.src: */%.c $(USERHEADERS)
212
- @( $(call SAFEMKDIR,$(@D) )) && \
213
- ( $(CD) $(call NATIVEPATH,$(@D) )) && \
213
+ @$(call SAFEMKDIR,$(@D)) && \
214
+ $(CD) $(call NATIVEPATH,$(@D)) && \
214
215
$(CC) $(CFLAGS) "$(call WINPATH,$(addprefix $(MAKEDIR)/,$<))"
215
216
216
217
# these rules compile the source files into object files
217
218
$(OBJDIR)/%.src: **/*/%.c $(USERHEADERS)
218
- @( $(call SAFEMKDIR,$(@D) )) && \
219
- ( $(CD) $(call NATIVEPATH,$(@D) )) && \
219
+ @$(call SAFEMKDIR,$(@D)) && \
220
+ $(CD) $(call NATIVEPATH,$(@D)) && \
220
221
$(CC) $(CFLAGS) "$(call WINPATH,$(addprefix $(MAKEDIR)/,$<))"
221
222
222
223
clean:
230
231
version:
231
232
@echo C SDK Version $(VERSION)
232
233
233
- .PHONY: all clean version gfx dirs
234
+ .PHONY: all clean version gfx dirs
0 commit comments