mirror of
https://github.com/davidgiven/fluxengine.git
synced 2025-10-31 11:17:01 -07:00
Make the GUI prototype build on Windows.
This commit is contained in:
5
Makefile
5
Makefile
@@ -27,6 +27,9 @@ export STRIP = /mingw32/bin/strip
|
||||
export CFLAGS += -I/mingw32/include/libusb-1.0 -I/mingw32/include
|
||||
export LDFLAGS +=
|
||||
export LIBS += -L/mingw32/lib -static -lz -lsqlite3 -lusb-1.0 -lprotobuf
|
||||
export GUILIBS += -luser32 -lkernel32 -lgdi32 -lcomctl32 -luxtheme -lmsimg32 \
|
||||
-lcomdlg32 -ld2d1 -ldwrite -lole32 -loleaut32 -loleacc -luuid \
|
||||
-lwindowscodecs
|
||||
export EXTENSION = .exe
|
||||
else
|
||||
|
||||
@@ -54,7 +57,7 @@ RANLIB += -c -no_warning_for_no_symbols
|
||||
export CC = clang
|
||||
export CXX = clang++
|
||||
export COBJC = clang
|
||||
export OBJCLDFLAGS = -framework Foundation -framework AppKit
|
||||
export GUILIBS = -framework Foundation -framework AppKit
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
69
mkninja.sh
69
mkninja.sh
@@ -43,8 +43,8 @@ rule link
|
||||
command = $CXX $LDFLAGS -o \$out \$in \$flags $LIBS
|
||||
description = LINK \$in
|
||||
|
||||
rule linkobjc
|
||||
command = $COBJC $LDFLAGS $OBJCLDFLAGS -o \$out \$in \$flags $LIBS
|
||||
rule linkgui
|
||||
command = $CXX $LDFLAGS $GUILDFLAGS -o \$out \$in \$flags $LIBS $GUILIBS
|
||||
description = LINK-OBJC \$in
|
||||
|
||||
rule test
|
||||
@@ -325,17 +325,28 @@ buildlibrary libagg.a \
|
||||
dep/stb/stb_image_write.c \
|
||||
dep/agg/src/*.cpp
|
||||
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
buildlibrary libui.a \
|
||||
-Idep/libui \
|
||||
dep/libui/common/*.c \
|
||||
dep/libui/darwin/*.m
|
||||
else
|
||||
buildlibrary libui.a \
|
||||
-Idep/libui \
|
||||
dep/libui/common/*.c \
|
||||
dep/libui/unix/*.c
|
||||
fi
|
||||
case "$(uname)" in
|
||||
Darwin)
|
||||
buildlibrary libui.a \
|
||||
-Idep/libui \
|
||||
dep/libui/common/*.c \
|
||||
dep/libui/darwin/*.m
|
||||
;;
|
||||
|
||||
MINGW*)
|
||||
buildlibrary libui.a \
|
||||
-Idep/libui \
|
||||
dep/libui/common/*.c \
|
||||
dep/libui/windows/*.cpp
|
||||
;;
|
||||
|
||||
*)
|
||||
buildlibrary libui.a \
|
||||
-Idep/libui \
|
||||
dep/libui/common/*.c \
|
||||
dep/libui/unix/*.c
|
||||
;;
|
||||
esac
|
||||
|
||||
buildlibrary libfmt.a \
|
||||
dep/fmt/format.cc \
|
||||
@@ -547,28 +558,16 @@ buildprogram fluxengine \
|
||||
libfmt.a \
|
||||
libagg.a \
|
||||
|
||||
if [ "$(uname)" = "Darwin" ]; then
|
||||
buildprogram fluxengine-gui \
|
||||
-rule linkobjc \
|
||||
libgui.a \
|
||||
libformats.a \
|
||||
libbackend.a \
|
||||
libconfig.a \
|
||||
libfl2.a \
|
||||
libfmt.a \
|
||||
libui.a \
|
||||
libagg.a
|
||||
else
|
||||
buildprogram fluxengine-gui \
|
||||
libgui.a \
|
||||
libformats.a \
|
||||
libbackend.a \
|
||||
libconfig.a \
|
||||
libfl2.a \
|
||||
libfmt.a \
|
||||
libui.a \
|
||||
libagg.a
|
||||
fi
|
||||
buildprogram fluxengine-gui \
|
||||
-rule linkgui \
|
||||
libgui.a \
|
||||
libformats.a \
|
||||
libbackend.a \
|
||||
libconfig.a \
|
||||
libfl2.a \
|
||||
libfmt.a \
|
||||
libui.a \
|
||||
libagg.a
|
||||
|
||||
buildlibrary libemu.a \
|
||||
dep/emu/fnmatch.c
|
||||
|
||||
Reference in New Issue
Block a user