Skip to content

Commit 5a035c3

Browse files
fix makefile
1 parent bfce4ce commit 5a035c3

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

src/std/makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@ LIBSHARED = $(call NATIVEPATH,$(wildcard $(SHAREDDIR)/*.src))
3232
LIBLINKED = $(call NATIVEPATH,$(wildcard $(LINKEDDIR)/*.src))
3333
LIB_H = $(call NATIVEPATH,$(wildcard *.h))
3434

35-
LIBFILEIO += $(call NATIVEPATH,$(wildcard $(FILEIODIR)/build/*.src))
36-
LIBSTATIC += $(call NATIVEPATH,$(wildcard $(STATICDIR)/build/*.src))
37-
LIBSHARED += $(call NATIVEPATH,$(wildcard $(SHAREDDIR)/build/*.src))
38-
LIBLINKED += $(call NATIVEPATH,$(wildcard $(LINKEDDIR)/build/*.src))
35+
LIBFILEIO_C := $(call NATIVEPATH,$(wildcard $(FILEIODIR)/*.c))
36+
LIBSTATIC_C := $(call NATIVEPATH,$(wildcard $(STATICDIR)/*.c))
37+
LIBSHARED_C := $(call NATIVEPATH,$(wildcard $(SHAREDDIR)/*.c))
38+
LIBLINKED_C := $(call NATIVEPATH,$(wildcard $(LINKEDDIR)/*.c))
39+
40+
LIBFILEIO += $(call NATIVEPATH,$(LIBFILEIO_C:$(FILEIODIR)/%.c=$(FILEIODIR)/build/%.src))
41+
LIBSTATIC += $(call NATIVEPATH,$(LIBSTATIC_C:$(STATICDIR)/%.c=$(STATICDIR)/build/%.src))
42+
LIBSHARED += $(call NATIVEPATH,$(LIBSHARED_C:$(SHAREDDIR)/%.c=$(SHAREDDIR)/build/%.src))
43+
LIBLINKED += $(call NATIVEPATH,$(LIBLINKED_C:$(LINKEDDIR)/%.c=$(LINKEDDIR)/build/%.src))
3944

4045
ifeq ($(OS),Windows_NT)
4146
COPY_HEADERS = (robocopy . $(LOC_H) $(LIB_H) /njh /njs /ndl /nc /ns) ^& exit 0
@@ -63,7 +68,7 @@ clean:
6368
# $(MAKE) -C $(LINKEDDIR) $(MAKECMDGOALS) # nothing to do
6469
$(MAKE) -C $(STATICDIR) $(MAKECMDGOALS)
6570

66-
install:
71+
install: all
6772
$(COPY_HEADERS)
6873
$(COPY_LIBFILEIO)
6974
$(COPY_LIBSTATIC)

0 commit comments

Comments
 (0)