diff options
author | Bad Diode <bd@badd10de.dev> | 2021-05-23 18:09:09 +0200 |
---|---|---|
committer | Bad Diode <bd@badd10de.dev> | 2021-05-23 18:09:09 +0200 |
commit | a928aab86ec33f385b749771747d1097b1fba277 (patch) | |
tree | 53f03275c0adecda8eea52af7ffb5f0eb499b7a1 | |
parent | c0f6187b99a1d82db71616ec67286b295cc27636 (diff) | |
download | uxngba-a928aab86ec33f385b749771747d1097b1fba277.tar.gz uxngba-a928aab86ec33f385b749771747d1097b1fba277.zip |
Add some configuration parameters for compilation
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | src/main.c | 15 |
2 files changed, 15 insertions, 2 deletions
@@ -34,10 +34,12 @@ CC := $(DEVKITBIN)/arm-none-eabi-gcc | |||
34 | OBJCOPY := $(DEVKITBIN)/arm-none-eabi-objcopy | 34 | OBJCOPY := $(DEVKITBIN)/arm-none-eabi-objcopy |
35 | ARCH := -mthumb -mthumb-interwork | 35 | ARCH := -mthumb -mthumb-interwork |
36 | SPECS := -specs=gba.specs | 36 | SPECS := -specs=gba.specs |
37 | CONFIG := | ||
37 | CFLAGS := -Wall -Wextra -pedantic -Wno-incompatible-pointer-types | 38 | CFLAGS := -Wall -Wextra -pedantic -Wno-incompatible-pointer-types |
38 | CFLAGS += -fno-strict-aliasing | 39 | CFLAGS += -fno-strict-aliasing |
39 | CFLAGS += -mcpu=arm7tdmi -mtune=arm7tdmi $(ARCH) | 40 | CFLAGS += -mcpu=arm7tdmi -mtune=arm7tdmi $(ARCH) |
40 | CFLAGS += $(INC_FLAGS) | 41 | CFLAGS += $(INC_FLAGS) |
42 | CFLAGS += $(CONFIG) | ||
41 | LDFLAGS := $(ARCH) $(SPECS) | 43 | LDFLAGS := $(ARCH) $(SPECS) |
42 | LDLIBS := $(LIBGBA) | 44 | LDLIBS := $(LIBGBA) |
43 | RELEASE_CFLAGS := -DNDEBUG -O2 | 45 | RELEASE_CFLAGS := -DNDEBUG -O2 |
@@ -23,12 +23,23 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | |||
23 | WITH REGARD TO THIS SOFTWARE. | 23 | WITH REGARD TO THIS SOFTWARE. |
24 | */ | 24 | */ |
25 | 25 | ||
26 | // | ||
27 | // Config parameters. | ||
28 | // | ||
29 | #ifndef TEXT_LAYER | ||
30 | #define TEXT_LAYER ppu.fg | ||
31 | #endif | ||
32 | |||
33 | #ifndef DEFAULT_CONTROL | ||
34 | #define DEFAULT_CONTROL CONTROL_CONTROLLER | ||
35 | #endif | ||
36 | |||
26 | typedef enum { | 37 | typedef enum { |
27 | CONTROL_CONTROLLER, | 38 | CONTROL_CONTROLLER, |
28 | CONTROL_MOUSE, | 39 | CONTROL_MOUSE, |
29 | } ControlMethod; | 40 | } ControlMethod; |
30 | 41 | ||
31 | static ControlMethod control_method = CONTROL_CONTROLLER; | 42 | static ControlMethod control_method = DEFAULT_CONTROL; |
32 | 43 | ||
33 | #define MOUSE_DELTA 1 | 44 | #define MOUSE_DELTA 1 |
34 | typedef struct Mouse { | 45 | typedef struct Mouse { |
@@ -280,7 +291,7 @@ int main(void) { | |||
280 | init_uxn(&u); | 291 | init_uxn(&u); |
281 | 292 | ||
282 | // Initialize text engine. | 293 | // Initialize text engine. |
283 | txt_init(1, ppu.fg); | 294 | txt_init(1, TEXT_LAYER); |
284 | txt_position(0,0); | 295 | txt_position(0,0); |
285 | 296 | ||
286 | // Main loop. | 297 | // Main loop. |