Skip to content

Commit e9159b2

Browse files
SunrisepeakSunrisepeak
authored
redesign makefile for test (#61)
1. fix Color class bug 2. redesign makefile for test Signed-off-by: Sunrisepeak <speakshen@163.com>
1 parent 8243ebf commit e9159b2

12 files changed

Lines changed: 150 additions & 26 deletions

File tree

‎core/painter/impl/colors/color.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class Color {
2929

3030
public: // cntor
3131

32-
Color(uint8_t r, uint8_t g, uint8_t b) :
33-
Color({r, g, b, 0}) { }
32+
Color(uint8_t r, uint8_t g, uint8_t b, uint8_t reserved = 0) :
33+
Color(RGB{r, g, b, reserved}) { }
3434

3535
Color(const RGB &rgb = WHITE) : Color(rgb, rgb) { }
3636

‎modules_info.mk‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
debug := test/debug
2+
base := test/base
23
gradient := test/gradient
4+
graphics := test/graphics
5+
rasterizer := test/rasterizer
6+
transformation := test/transformation
7+
transparency := test/transparency
38

49
ALL_MODULES := $(debug) \
5-
$(gradient)
10+
$(base) \
11+
$(gradient) \
12+
$(graphics) \
13+
$(rasterizer) \
14+
$(transformation) \
15+
$(transparency)
616

717
MODULES_LIST := moduels: \
818
debug \
9-
gradient
19+
base \
20+
gradient \
21+
graphics \
22+
rasterizer \
23+
transformation \
24+
transparency
1025

1126
MODULES_INFO := $(addsuffix \n,$(MODULES_LIST))

‎test/base/Makefile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
include ../../tools/makefile/function.mk
2+
3+
MODULE := base
4+
EFI := $(addprefix $(BIN_DIR)/,$(MODULE))
5+
6+
SRCS := t_base_memory.cpp
7+
8+
LOCAL_INC := $(addprefix -I,$(INC_DIR))
9+
10+
OBJS := $(SRCS:.cpp=.o)
11+
OBJS := $(addprefix $(OBJ_DIR)/,$(OBJS))
12+
13+
# batch compiler to obj by CXX
14+
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(OBJ_DIR),srcToObjFile)
15+
# batch compiler/ld to bin by LD
16+
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(BIN_DIR),objToBinFile)
17+
18+
19+
$(MODULE): $(SRCS) $(TUGUI_INCLUDE_FILE)
20+
@echo + $(MODULE)
21+
$(CXX_CMDS)
22+
$(LD_CMDS)

‎test/gradient/Makefile‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
include ../../tools/makefile/function.mk
22

33
MODULE := gradient
4-
EFI := $(addprefix $(BIN_DIR)/,$(MODULE))
4+
5+
LOCAL_OBJ_DIR := $(OBJ_DIR)/$(MODULE)
6+
LOCAL_BIN_DIR := $(BIN_DIR)/$(MODULE)
57

68
SRCS := t_gradient_circle.cpp \
79
t_gradient_line.cpp \
@@ -10,18 +12,17 @@ SRCS := t_gradient_circle.cpp \
1012
LOCAL_INC := $(addprefix -I,$(INC_DIR))
1113

1214
OBJS := $(SRCS:.cpp=.o)
13-
OBJS := $(addprefix $(OBJ_DIR)/,$(OBJS))
15+
OBJS := $(addprefix $(LOCAL_OBJ_DIR)/,$(OBJS))
16+
1417

1518
# batch compiler to obj by CXX
16-
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(OBJ_DIR),srcToObjFile)
19+
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(LOCAL_OBJ_DIR),srcToObjFile)
1720
# batch compiler/ld to bin by LD
18-
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(BIN_DIR),objToBinFile)
21+
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(LOCAL_BIN_DIR),objToBinFile)
1922

2023

2124
$(MODULE): $(SRCS) $(TUGUI_INCLUDE_FILE)
22-
@for cmd in $(CXX_CMDS); do \
23-
echo $$cmd; eval $$cmd; \
24-
done
25-
@for cmd in $(LD_CMDS); do \
26-
echo $$cmd; eval $$cmd; \
27-
done
25+
@echo + $(MODULE)
26+
@mkdir -p $(LOCAL_OBJ_DIR) $(LOCAL_BIN_DIR)
27+
$(CXX_CMDS)
28+
$(LD_CMDS)

‎test/graphics/Makefile‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
MODULE := rectangle
1+
include ../../tools/makefile/function.mk
22

3-
EFI := $(addprefix $(BIN_DIR)/,$(MODULE))
3+
MODULE := graphics
44

5-
SRCS := rectangle.cpp \
6-
line.cpp
5+
SRCS := t_graphics_line.cpp \
6+
t_graphics_rectangle.cpp
77

88
LOCAL_INC := $(addprefix -I,$(INC_DIR))
99

1010
OBJS := $(SRCS:.cpp=.o)
1111
OBJS := $(addprefix $(OBJ_DIR)/,$(OBJS))
1212

13-
$(EFI): $(SRCS) $(TUGUI_INCLUDE_FILE)
14-
@echo + $@
15-
$(CXX) -c $(SRCS) $(CXX_FLAGS) -o $(OBJS) $(LOCAL_INC)
16-
$(LD) $(LD_FLAGS) $(BOOTMAIN_OBJS) $(OBJS) -o $@ $(UEFI_APP_LD_FLAGS)
13+
# batch compiler to obj by CXX
14+
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(OBJ_DIR),srcToObjFile)
15+
# batch compiler/ld to bin by LD
16+
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(BIN_DIR),objToBinFile)
17+
18+
$(MODULE): $(SRCS) $(TUGUI_INCLUDE_FILE)
19+
@echo + $(MODULE)
20+
$(CXX_CMDS)
21+
$(LD_CMDS)
22+

test/graphics/line.cpp renamed to test/graphics/t_graphics_line.cpp

File renamed without changes.

test/graphics/rectangle.cpp renamed to test/graphics/t_graphics_rectangle.cpp

File renamed without changes.

‎test/rasterizer/Makefile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
include ../../tools/makefile/function.mk
2+
3+
MODULE := rasterizer
4+
5+
LOCAL_OBJ_DIR := $(OBJ_DIR)/$(MODULE)
6+
LOCAL_BIN_DIR := $(BIN_DIR)/$(MODULE)
7+
8+
SRCS := circle.cpp \
9+
rectangle.cpp
10+
11+
LOCAL_INC := $(addprefix -I,$(INC_DIR))
12+
13+
OBJS := $(SRCS:.cpp=.o)
14+
OBJS := $(addprefix $(LOCAL_OBJ_DIR)/,$(OBJS))
15+
16+
17+
# batch compiler to obj by CXX
18+
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(LOCAL_OBJ_DIR),srcToObjFile)
19+
# batch compiler/ld to bin by LD
20+
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(LOCAL_BIN_DIR),objToBinFile)
21+
22+
23+
$(MODULE): $(SRCS) $(TUGUI_INCLUDE_FILE)
24+
@echo + $(MODULE)
25+
@mkdir -p $(LOCAL_OBJ_DIR) $(LOCAL_BIN_DIR)
26+
$(CXX_CMDS)
27+
$(LD_CMDS)

‎test/transformation/Makefile‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
include ../../tools/makefile/function.mk
2+
3+
MODULE := transformation
4+
5+
LOCAL_OBJ_DIR := $(OBJ_DIR)/$(MODULE)
6+
LOCAL_BIN_DIR := $(BIN_DIR)/$(MODULE)
7+
8+
SRCS := line.cpp
9+
10+
LOCAL_INC := $(addprefix -I,$(INC_DIR))
11+
12+
OBJS := $(SRCS:.cpp=.o)
13+
OBJS := $(addprefix $(LOCAL_OBJ_DIR)/,$(OBJS))
14+
15+
16+
# batch compiler to obj by CXX
17+
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(LOCAL_OBJ_DIR),srcToObjFile)
18+
# batch compiler/ld to bin by LD
19+
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(LOCAL_BIN_DIR),objToBinFile)
20+
21+
22+
$(MODULE): $(SRCS) $(TUGUI_INCLUDE_FILE)
23+
@echo + $(MODULE)
24+
@mkdir -p $(LOCAL_OBJ_DIR) $(LOCAL_BIN_DIR)
25+
$(CXX_CMDS)
26+
$(LD_CMDS)

‎test/transparency/Makefile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
include ../../tools/makefile/function.mk
2+
3+
MODULE := transparency
4+
5+
LOCAL_OBJ_DIR := $(OBJ_DIR)/$(MODULE)
6+
LOCAL_BIN_DIR := $(BIN_DIR)/$(MODULE)
7+
8+
SRCS := transparency.cpp
9+
10+
LOCAL_INC := $(addprefix -I,$(INC_DIR))
11+
12+
OBJS := $(SRCS:.cpp=.o)
13+
OBJS := $(addprefix $(LOCAL_OBJ_DIR)/,$(OBJS))
14+
15+
16+
17+
# batch compiler to obj by CXX
18+
CXX_CMDS = $(call batchCompilerCmds,$(CXX),$(SRCS), -c $(CXX_FLAGS) $(LOCAL_INC),$(LOCAL_OBJ_DIR),srcToObjFile)
19+
# batch compiler/ld to bin by LD
20+
LD_CMDS = $(call batchCompilerCmds,$(LD),$(OBJS),$(LD_FLAGS) $(UEFI_APP_LD_FLAGS) $(BOOTMAIN_OBJS),$(LOCAL_BIN_DIR),objToBinFile)
21+
22+
23+
$(MODULE): $(SRCS) $(TUGUI_INCLUDE_FILE)
24+
@echo + $(MODULE)
25+
@mkdir -p $(LOCAL_OBJ_DIR) $(LOCAL_BIN_DIR)
26+
$(CXX_CMDS)
27+
$(LD_CMDS)

0 commit comments

Comments
 (0)