Skip to content

Commit a8b14c6

Browse files
committed
add Qt to build system
1 parent ee4dc3c commit a8b14c6

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ ifdef CONFIG_HAIKU
8080
LIBS+= -lbe
8181
endif
8282

83+
ifdef CONFIG_QT
84+
OBJS+= qt.o
85+
LIBS+= `pkg-config --libs QtGui QtCore`
86+
CFLAGS+= `pkg-config --cflags QtGui QtCore`
87+
endif
88+
8389
ifdef CONFIG_WIN32
8490
OBJS+= unix.o win32.o
8591
TOBJS+= unix.o win32.o
@@ -245,6 +251,9 @@ $(OBJS_DIR)/haiku.o: haiku.cpp $(DEPENDS) Makefile
245251
$(TOBJS_DIR)/haiku.o: haiku.cpp $(DEPENDS) Makefile
246252
g++ $(DEFINES) -DCONFIG_TINY $(CFLAGS) -Wno-multichar -o $@ -c $<
247253

254+
$(OBJS_DIR)/qt.o: qt.cpp $(DEPENDS) Makefile
255+
g++ $(DEFINES) $(CFLAGS) -Wno-multichar -o $@ -c $<
256+
248257
%.s: %.c $(DEPENDS) Makefile
249258
$(CC) $(DEFINES) $(CFLAGS) -o $@ -S $<
250259

configure

+7
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ win32="no"
5757
cygwin="no"
5858
darwin="no"
5959
haiku="no"
60+
qt="yes"
6061
lshared="no"
6162
dllibs="-ldl"
6263
extralibs=""
@@ -480,6 +481,7 @@ echo "Source path $source_path"
480481
echo "C compiler $cc"
481482
echo "Tiny build $tiny"
482483
echo "X11 support $x11"
484+
echo "Qt support $qt"
483485
echo "Xvideo support $xv"
484486
#echo "Xrender support $xrender"
485487
echo "libpng support $png"
@@ -586,6 +588,11 @@ if test "$haiku" = "yes" ; then
586588
echo "CONFIG_HAIKU=yes" >> $TMPMAK
587589
fi
588590

591+
if test "$qt" = "yes" ; then
592+
echo "#define CONFIG_QT 1" >> $TMPH
593+
echo "CONFIG_QT=yes" >> $TMPMAK
594+
fi
595+
589596
if test "$x11" = "yes" ; then
590597
echo "#define CONFIG_X11 1" >> $TMPH
591598
echo "CONFIG_X11=yes" >> $TMPMAK

0 commit comments

Comments
 (0)