Skip to content

Commit 8e9c5e6

Browse files
Fix install on windows
1 parent 5359693 commit 8e9c5e6

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

examples/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ $(DIRS):
1010
$(MAKE) -C $(dir $@) $(MAKECMDGOALS)
1111

1212
.PHONY: all clean
13+

makefile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ RELEASE_NAME := CEdev
88
ifeq ($(OS),Windows_NT)
99
NATIVEPATH = $(subst /,\,$(1))
1010
WINPATH = $(NATIVEPATH)
11-
WINCHKDIR = if exist $(1)
11+
WINCHKPATH = $(NATIVEPATH)
12+
WINCHKDIR := if exist
13+
WINNCHKDIR:= if not exist
1214
RM = del /f 2>nul
1315
RMDIR = rmdir /s /q
1416
MKDIR = mkdir
@@ -69,7 +71,7 @@ CEDEVDIR := $(call NATIVEPATH,$(INSTALLLOC)/$(RELEASE_NAME))
6971
INSTALLBIN := $(call NATIVEPATH,$(INSTALLLOC)/$(RELEASE_NAME)/bin)
7072
INSTALLINC := $(call NATIVEPATH,$(INSTALLLOC)/$(RELEASE_NAME)/include)
7173
INSTALLLIB := $(call NATIVEPATH,$(INSTALLLOC)/$(RELEASE_NAME)/lib)
72-
DIRS := $(INSTALLINC) $(INSTALLINC)/ce $(INSTALLINC)/ce/libs $(INSTALLINC)/std $(INSTALLBIN) $(INSTALLLIB)
74+
DIRS := $(INSTALLINC) $(INSTALLINC)/compat $(INSTALLINC)/ce $(INSTALLINC)/ce/libs $(INSTALLINC)/std $(INSTALLBIN) $(INSTALLLIB)
7375
DIRS := $(call NATIVEPATH,$(DIRS))
7476

7577
all: $(SPASM) $(CONVHEX) $(CONVPNG) graphx fileioc keypadc ce std
@@ -141,7 +143,7 @@ clean-keypadc:
141143
# uninstall rule
142144
#----------------------------
143145
uninstall:
144-
$(WINCHKDIR) $(RMDIR) $(call NATIVEPATH,$(INSTALLLOC)/CEdev)
146+
$(WINCHKDIR) $(call WINCHKPATH,$(INSTALLLOC)/CEdev) $(RMDIR) $(call NATIVEPATH,$(INSTALLLOC)/CEdev)
145147

146148
#----------------------------
147149
# install rule
@@ -159,18 +161,18 @@ install: $(DIRS) chmod
159161
$(MAKE) -C $(FILEIOCDIR) install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR)
160162
$(MAKE) -C $(CEDIR) install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR)
161163
$(MAKE) -C $(STDDIR) install PREFIX=$(PREFIX) DESTDIR=$(DESTDIR)
162-
$(CPDIR) $(call NATIVEPATH,$(SRCDIR)/compat/lib) $(call NATIVEPATH,$(INSTALLINC)/)
164+
$(CPDIR) $(call NATIVEPATH,$(SRCDIR)/compat) $(call NATIVEPATH,$(INSTALLINC)/compat)
163165

164166
chmod:
165167
$(CHMOD)
166168

167169
$(DIRS):
168-
$(MKDIR) $(INSTALLBIN)
169-
$(MKDIR) $(INSTALLLIB)
170-
$(MKDIR) $(INSTALLINC)
171-
$(MKDIR) $(call NATIVEPATH,$(INSTALLLIB)/asm)
172-
$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce)
173-
$(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/std)
170+
$(WINNCHKDIR) $(call WINCHKPATH,$(INSTALLBIN)) $(MKDIR) $(INSTALLBIN)
171+
$(WINNCHKDIR) $(call WINCHKPATH,$(INSTALLLIB)) $(MKDIR) $(INSTALLLIB)
172+
$(WINNCHKDIR) $(call WINCHKPATH,$(INSTALLINC)) $(MKDIR) $(INSTALLINC)
173+
$(WINNCHKDIR) $(call WINCHKPATH,$(INSTALLLIB)/asm) $(MKDIR) $(call NATIVEPATH,$(INSTALLLIB)/asm)
174+
$(WINNCHKDIR) $(call WINCHKPATH,$(INSTALLINC)/ce) $(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/ce)
175+
$(WINNCHKDIR) $(call WINCHKPATH,$(INSTALLINC)/std) $(MKDIR) $(call NATIVEPATH,$(INSTALLINC)/std)
174176

175177
#----------------------------
176178
# release rule

src/example_makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ifeq ($(OS),Windows_NT)
2323
NATIVEPATH = $(subst /,\,$(1))
2424
WINPATH = $(NATIVEPATH)
2525
WINRELPATH = $(subst /,\,$(1))
26-
WINCHKDIR = if not exist $(1)
26+
WINCHKDIR = if not exist
2727
RM = del /q /f 2>nul
2828
CEDEV ?= $(call NATIVEPATH,$(realpath ..\..))
2929
BIN ?= $(call NATIVEPATH,$(CEDEV)/bin)
@@ -116,7 +116,7 @@ endif
116116

117117
#Define the nesassary headers, along with any the user may have defined, where modification should just trigger a build
118118
USERHEADERS := $(call NATIVEPATH,$(foreach dir,$(ALLDIRS),$(wildcard $(dir)*.h)))
119-
HEADERS := $(subst $(space),;,$(call WINPATH,$(ALLDIRS) $(addprefix $(CEDEV)/,include include/ce include/std)))
119+
HEADERS := $(subst $(space),;,$(call WINPATH,$(ALLDIRS) $(addprefix $(CEDEV)/,include/compat include/ce include/std)))
120120
HEADERS := $(subst \;,;,$(HEADERS))
121121
HEADERS := $(subst \;,;,$(HEADERS))
122122
HEADERS := $(subst /;,;,$(HEADERS))

0 commit comments

Comments
 (0)