aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlonkaars <loek@pipeframe.xyz>2023-02-25 16:02:35 +0100
committerlonkaars <loek@pipeframe.xyz>2023-02-25 16:02:35 +0100
commit0d7bd92672acb449761def9e234934c4a9a05129 (patch)
tree7db8cba21231fdf6b6f3b97d857c828183a6bfbb /src
parent0e6f7148ab0987574c45e78cb8fd6ff72fdf103a (diff)
update/fix build config for windows
Diffstat (limited to 'src')
-rw-r--r--src/.gitignore1
-rw-r--r--src/makefile6
2 files changed, 4 insertions, 3 deletions
diff --git a/src/.gitignore b/src/.gitignore
index 8b91843..67661d0 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -2,3 +2,4 @@
main.elf
main.bin
main
+main.exe
diff --git a/src/makefile b/src/makefile
index 83c7df5..1f1dc65 100644
--- a/src/makefile
+++ b/src/makefile
@@ -5,6 +5,8 @@ TARGET = main
# platform is ds (desktop) or stm (stm32)
PLATFORM = ds
+HOST=$(strip $(shell uname -o))
+
ifeq ($(PLATFORM),stm)
STM = true
include stm32.mk
@@ -14,8 +16,6 @@ DESKTOP = true
include ds.mk
endif
-HOST=$(strip $(shell uname -o))
-
SHARED_FLAGS += -g
SHARED_FLAGS += -Wall
SHARED_FLAGS += -Wextra
@@ -72,7 +72,7 @@ flash: $(TARGET).bin
$(CC) -c $(CFLAGS) $< -o $@
$(TARGET): $(OBJS)
- $(LD) $(LFLAGS) $^ -o $@
+ $(LD) $^ $(LFLAGS) -o $@
compile_commands.json:
compiledb make -Bn