Skip to content

Commit 0ff1cac

Browse files
howard0suhoward0su
committed
Fix emu_devo8
1 parent 4c0027c commit 0ff1cac

3 files changed

Lines changed: 35 additions & 45 deletions

File tree

‎src/Makefile.inc‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ CFLAGS += -DENABLE_MODULAR=$(MODULAR)
105105
endif
106106

107107
CFLAGS := $(CFLAGS) -g -Wall -Wextra -Werror=undef -I$(SDIR) -I$(SDIR)/firmware -D$(PROGMODE) -std=gnu99 \
108-
-I$(SDIR)target/tx/$(FAMILY)/$(TARGET) -I$(SDIR)/gui/$(SCREENSIZE) \
108+
-I$(SDIR)/target/tx/$(FAMILY)/$(TARGET) -I$(SDIR)/gui/$(SCREENSIZE) \
109109
-I$(SDIR)/pages/$(SCREENSIZE) \
110110
-DHGVERSION="\"${HGVERSION}\""
111111
CXXFLAGS := $(CXXFLAGS) $(patsubst -std=gnu99,,$(CFLAGS))
@@ -152,7 +152,7 @@ clean:
152152
filesystem/$(FILESYSYTEM) 2> /dev/null || true
153153

154154
language:
155-
../utils/extract_strings.pl -po > fs/language/deviation.po
155+
../utils/extract_strings.pl -po > $(SDIR)/fs/language/deviation.po
156156

157157

158158
zip: $(TARGET).zip
@@ -192,7 +192,7 @@ coverity:
192192
tar -cvzf coverity-$(HGVERSION).tgz cov-int
193193

194194
lint:
195-
../utils/run_linter.py --diff --debug
195+
$(SDIR)/../utils/run_linter.py --diff --debug
196196

197197
##########################################
198198
#Ensure necessary directories are created#
@@ -226,65 +226,65 @@ endif
226226
true
227227

228228
.PHONY: $(PRE_FS) $(LAST_MODEL)
229-
$(LAST_MODEL): model_template.ini tx_template.ini $(FONTS) $(PRE_FS)
229+
$(LAST_MODEL): $(SDIR)/model_template.ini $(SDIR)/tx_template.ini $(FONTS) $(PRE_FS)
230230
@echo " + Copying template files for $(FILESYSTEM)"
231231
mkdir -p filesystem/$(FILESYSTEM) || true
232-
for i in $(FILESYSTEMS); do cp -prf fs/$$i/* filesystem/$(FILESYSTEM)/; done
232+
for i in $(FILESYSTEMS); do cp -prf $(SDIR)/fs/$$i/* filesystem/$(FILESYSTEM)/; done
233233
rm filesystem/$(FILESYSTEM)/*/.ignore 2>/dev/null || true
234-
cp tx_template.ini filesystem/$(FILESYSTEM)/tx.ini
234+
cp $(SDIR)/tx_template.ini filesystem/$(FILESYSTEM)/tx.ini
235235
echo 'empty' > filesystem/$(FILESYSTEM)/errors.txt
236236
mkdir filesystem/$(FILESYSTEM)/models 2> /dev/null || true
237237
echo 'name=Model1' > filesystem/$(FILESYSTEM)/models/model1.ini \
238-
&& cat model_template.ini >> filesystem/$(FILESYSTEM)/models/model1.ini
239-
cp model_template.ini filesystem/$(FILESYSTEM)/models/default.ini
238+
&& cat $(SDIR)/model_template.ini >> filesystem/$(FILESYSTEM)/models/model1.ini
239+
cp $(SDIR)/model_template.ini filesystem/$(FILESYSTEM)/models/default.ini
240240
ifdef LANGUAGE
241241
mkdir filesystem/$(FILESYSTEM)/language 2> /dev/null; \
242-
../utils/extract_strings.pl -po -fs filesystem/$(FILESYSTEM)/language -targets $(LANGUAGE) -update -objdir $(ODIR)
242+
$(SDIR)/../utils/extract_strings.pl -po -fs filesystem/$(FILESYSTEM)/language -targets $(LANGUAGE) -update -objdir $(ODIR)
243243
endif
244244
export tx=$(FILESYSTEM); \
245245
number=2 ; while [ $$number -le $(NUM_MODELS) ] ; do \
246-
cp model_template.ini filesystem/$$tx/models/model$$number.ini; \
246+
cp $(SDIR)/model_template.ini filesystem/$$tx/models/model$$number.ini; \
247247
number=`expr $$number + 1`; \
248248
done
249249
@echo " + Checking string list length for $(FILESYSTEM)"
250250
ifeq "$(TYPE)" "dev"
251-
../utils/check_string_size.pl -target $(FILESYSTEM) -objdir $(ODIR)
251+
$(SDIR)/../utils/check_string_size.pl -target $(FILESYSTEM) -objdir $(ODIR)
252252
else
253-
../utils/check_string_size.pl -target $(FILESYSTEM) -objdir $(ODIR) -quiet
253+
$(SDIR)/../utils/check_string_size.pl -target $(FILESYSTEM) -objdir $(ODIR) -quiet
254254
endif
255-
../utils/run_linter.py --diff --skip-github --no-fail
255+
$(SDIR)/../utils/run_linter.py --diff --skip-github --no-fail
256256

257257
######################
258258
#Necessary Font files#
259259
######################
260-
filesystem/$(FILESYSTEM)/media/12normal.fon: fonts/12normal.bdf
260+
filesystem/$(FILESYSTEM)/media/12normal.fon: $(SDIR)/fonts/12normal.bdf
261261
mkdir -p filesystem/$(FILESYSTEM)/media/
262-
../utils/font/bdf_to_font.pl -maxsize 12 -mode bin $< -out $@ -minspace 10
262+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 12 -mode bin $< -out $@ -minspace 10
263263

264-
filesystem/$(FILESYSTEM)/media/15normal.fon: fonts/15normal.bdf
264+
filesystem/$(FILESYSTEM)/media/15normal.fon: $(SDIR)/fonts/15normal.bdf
265265
mkdir -p filesystem/$(FILESYSTEM)/media/
266-
../utils/font/bdf_to_font.pl -maxsize 15 -mode bin $< -out $@ -minspace 8
266+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 15 -mode bin $< -out $@ -minspace 8
267267

268268
# special font for f12e with 18x12 char size
269-
filesystem/$(FILESYSTEM)/media/f12e.fon: fonts/f12e.bdf
269+
filesystem/$(FILESYSTEM)/media/f12e.fon: $(SDIR)/fonts/f12e.bdf
270270
mkdir -p filesystem/$(FILESYSTEM)/media/
271-
../utils/font/bdf_to_font.pl -maxsize 18 -mode bin $< -out $@ -minspace 8
271+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 18 -mode bin $< -out $@ -minspace 8
272272

273-
filesystem/$(FILESYSTEM)/media/12ascii.fon: fonts/12normal.bdf
273+
filesystem/$(FILESYSTEM)/media/12ascii.fon: $(SDIR)/fonts/12normal.bdf
274274
mkdir -p filesystem/$(FILESYSTEM)/media/
275-
../utils/font/bdf_to_font.pl -maxsize 12 -mode bin $< -out $@ -minspace 10 -ascii
275+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 12 -mode bin $< -out $@ -minspace 10 -ascii
276276

277-
filesystem/$(FILESYSTEM)/media/15ascii.fon: fonts/15normal.bdf
277+
filesystem/$(FILESYSTEM)/media/15ascii.fon: $(SDIR)/fonts/15normal.bdf
278278
mkdir -p filesystem/$(FILESYSTEM)/media/
279-
../utils/font/bdf_to_font.pl -maxsize 15 -mode bin $< -out $@ -minspace 8 -ascii
279+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 15 -mode bin $< -out $@ -minspace 8 -ascii
280280

281-
filesystem/$(FILESYSTEM)/media/23bold.fon: fonts/23bold.bdf
281+
filesystem/$(FILESYSTEM)/media/23bold.fon: $(SDIR)/fonts/23bold.bdf
282282
mkdir -p filesystem/$(FILESYSTEM)/media/
283-
../utils/font/bdf_to_font.pl -maxsize 23 -mode bin $< -out $@ -minspace 8
283+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 23 -mode bin $< -out $@ -minspace 8
284284

285-
filesystem/$(FILESYSTEM)/media/04b03.fon: fonts/04b03.bdf
285+
filesystem/$(FILESYSTEM)/media/04b03.fon: $(SDIR)/fonts/04b03.bdf
286286
mkdir -p filesystem/$(FILESYSTEM)/media/
287-
../utils/font/bdf_to_font.pl -maxsize 5 -mode bin $< -out $@ -minspace 5
287+
$(SDIR)/../utils/font/bdf_to_font.pl -maxsize 5 -mode bin $< -out $@ -minspace 5
288288

289289
##############################
290290
#Build rules for all .o files#

‎src/target/drivers/mcu/emu/Makefile.inc‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
ifndef BUILD_TARGET
2-
3-
SRC_CXX = $(wildcard target/tx/$(FAMILY)/$(TARGET)/*.cpp) \
4-
$(wildcard target/drivers/mcu/emu/*.cpp)
5-
SRC_C = $(wildcard target/tx/$(FAMILY)/$(TARGET)/*.c) \
6-
$(wildcard target/drivers/mcu/emu/*.c) \
1+
SRC_CXX = $(wildcard $(SDIR)/target/tx/$(FAMILY)/$(TARGET)/*.cpp) \
2+
$(wildcard $(SDIR)/target/drivers/mcu/emu/*.cpp)
3+
SRC_C = $(wildcard $(SDIR)/target/tx/$(FAMILY)/$(TARGET)/*.c) \
4+
$(wildcard $(SDIR)/target/drivers/mcu/emu/*.c) \
75
$(wildcard $(SDIR)/target/drivers/filesystems/*.c)
86

97
ifeq ("$(SCREENSIZE)", "128x64x1")
@@ -20,9 +18,9 @@ else
2018
CFLAGS = -DEMULATOR=USE_NATIVE_FS
2119
endif
2220

23-
CFLAGS += -Itarget/drivers/mcu/emu -I$(SDIR)/target/drivers/filesystems
21+
CFLAGS += -I$(SDIR)/target/drivers/mcu/emu -I$(SDIR)/target/drivers/filesystems
2422

25-
ALL = $(TARGET).$(EXEEXT)
23+
ALL += $(TARGET).$(EXEEXT)
2624

2725
TYPE ?= dev
2826

@@ -44,6 +42,7 @@ ifdef WINDOWS
4442
EXEEXT = exe
4543
ODIREXT = -w32
4644
else
45+
EXEEXT =
4746
CFLAGS := $(CFLAGS) $(shell fltk-config --cflags)
4847
LFLAGS := $(LFLAGS) $(shell fltk-config --ldflags)
4948
ifndef SOUND
@@ -52,7 +51,7 @@ else
5251
LFLAGS := $(LFLAGS) -lportaudio
5352
endif
5453
endif
55-
else #BUILD_TARGET
54+
5655
CFLAGS += -DFILESYSTEM_DIR="\"filesystem/$(FILESYSTEM)\""
5756

5857
$(TARGET).zip: $(TARGET).$(EXEEXT) $(TARGET).fs_wrapper
@@ -66,5 +65,3 @@ ifeq "$(INCLUDE_FS)" "1"
6665
zip -ur deviation-$(HGVERSION).zip filesystem/$(FILESYSTEM)
6766
endif
6867
rm -f deviation-$(HGVERSION).$(EXEEXT)
69-
70-
endif #BUILD_TARGET

‎src/target/tx/devo/emu_devo8/Makefile.inc‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)