summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2023-11-19 19:08:53 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2023-11-19 19:08:53 +0100
commit7e8994c4a295e8709d4940656248c231de62a8a6 (patch)
tree31e8ba9ed537971b67dcad9a6212de5d984b2dfb /src/Makefile
parenta72eff7588440a95ed49119cb348673cd000fc8c (diff)
Windows/MSVC: Fix wide char commandline handling (#840)
Windows programs (subsystem:windows, not Windows console programs) compiled with Visual Studio need a WinMain entry point. The commandline arguments handled by this function are now properly converted to UTF-8 before the standard main() entry point is called. This applies only to Visual Studio! Note that some build systems like MinGW and/or MSYS2 may still have issues with some Unicode (non-ASCII) commandline arguments.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 39a77d29c..f95ce2fec 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -244,7 +244,8 @@ IMGCPPFILES = \
Fl_SVG_Image.cxx \
drivers/SVG/Fl_SVG_File_Surface.cxx
-CFILES = fl_call_main.c flstring.c numericsort.c vsnprintf.c
+CFILES = flstring.c numericsort.c vsnprintf.c
+CFILES_WIN = fl_call_main.c
UTF8CFILES = \
xutf8/case.c \
@@ -431,7 +432,7 @@ EXTRA_OBJECTS_WAYLANDX11 = $(EXTRA_OBJECTS_WAYLAND)
EXTRA_CXXFLAGS_WAYLAND = -I.
EXTRA_CXXFLAGS_WAYLANDX11 = $(EXTRA_CXXFLAGS_WAYLAND)
-CFILES_WIN = $(GDICFILES)
+CFILES_WIN += $(GDICFILES)
CFILES += $(CFILES_$(BUILD))
CXXFLAGS += $(EXTRA_CXXFLAGS_$(BUILD))