diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2022-05-16 17:03:15 -0400 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2022-05-16 17:03:15 -0400 |
| commit | 67ffe1f2ce9f3432cb524dced5e6fba96519b4fd (patch) | |
| tree | c61a251e0bbad2570a1cf7dd6b7c5b1a6abde2a8 | |
| parent | 1b176cf6cd75c8031a140961655cdd3c16589a68 (diff) | |
building with mingw
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | source/file.cpp | 2 | ||||
| -rw-r--r-- | source/main.cpp | 2 |
3 files changed, 18 insertions, 12 deletions
@@ -1,26 +1,32 @@ +#linux: CXXFILES += source/serial/src/impl/unix.cc source/serial/src/impl/list_ports/list_ports_unix.cc +#linux: LDFLAGS = -lSDL2 -lGL -lpthread + +CROSS = x86_64-w64-mingw32- +CXX = $(CROSS)g++ + CXXFILES := \ source/serial/src/serial.cc \ - source/serial/src/impl/unix.cc \ - source/serial/src/impl/list_ports/list_ports_linux.cc \ + source/serial/src/impl/win.cc \ + source/serial/src/impl/list_ports/list_ports_win.cc \ $(wildcard source/imgui/backends/*.cpp) \ $(wildcard source/imgui/*.cpp) \ $(wildcard source/stmdsp/*.cpp) \ $(wildcard source/*.cpp) OFILES := $(patsubst %.cc, %.o, $(patsubst %.cpp, %.o, $(CXXFILES))) -OUTPUT := stmdspgui +OUTPUT := stmdspgui.exe -#CXXFLAGS := -std=c++20 -O2 \ -# -Isource -Isource/imgui -Isource/stmdsp -Isource/serial/include -CXXFLAGS := -std=c++20 -ggdb -O0 -g3 \ +CXXFLAGS := -std=c++20 -O2 \ -Isource -Isource/imgui -Isource/stmdsp -Isource/serial/include \ - -Wall -Wextra -pedantic + -Wall -Wextra -pedantic \ + -DSTMDSP_WIN32 -Wa,-mbig-obj +LDFLAGS = -mwindows -lSDL2 -lopengl32 -lsetupapi -lole32 all: $(OUTPUT) $(OUTPUT): $(OFILES) @echo " LD " $(OUTPUT) - @g++ $(OFILES) -o $(OUTPUT) -lSDL2 -lGL -lpthread + @$(CXX) $(OFILES) -o $(OUTPUT) $(LDFLAGS) clean: @echo " CLEAN" @@ -28,9 +34,9 @@ clean: %.o: %.cpp @echo " CXX " $< - @g++ $(CXXFLAGS) -c $< -o $@ + @$(CXX) $(CXXFLAGS) -c $< -o $@ %.o: %.cc @echo " CXX " $< - @g++ $(CXXFLAGS) -c $< -o $@ + @$(CXX) $(CXXFLAGS) -c $< -o $@ diff --git a/source/file.cpp b/source/file.cpp index fe5dafb..b4332f4 100644 --- a/source/file.cpp +++ b/source/file.cpp @@ -104,7 +104,7 @@ void fileRenderMenu() if (ImGui::BeginMenu("Open Example")) { for (const auto& file : fileExampleList) { - if (ImGui::MenuItem(file.filename().c_str())) { + if (ImGui::MenuItem(file.filename().string().c_str())) { fileCurrentPath = file.string(); openCurrentFile(); diff --git a/source/main.cpp b/source/main.cpp index e8641bc..d6277b7 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -47,7 +47,7 @@ static ImFont *fontMono = nullptr; static void renderWindow(); -int main(int, char **) +int main(int argc, char *argv[]) { if (!guiInitialize()) return -1; |