Switch the default linux target to qt.

The old X11 version can still be built with make x11.
If this breaks some use cases, please tell me - it's hard to
predict. My minimal testing seems to indicate it works, and
make does the heavy lifting for us.
This commit is contained in:
jean.chalard
2011-12-18 12:40:47 +00:00
parent d1a30f10a5
commit 07582eca45

View File

@@ -5,7 +5,7 @@ RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache)
QMAKE = qmake
QMAKEFILE = wagic-qt.pro
ifeq ($(RESULT),)
DEFAULT_RULE = linux
DEFAULT_RULE = qt
TARGET_ARCHITECTURE = linux
TARGET = bin/wagic
else
@@ -18,8 +18,13 @@ endif
ifeq ($(MAKECMDGOALS),debug)
DEFAULT_RULE = debug
endif
ifeq ($(MAKECMDGOALS),linux)
DEFAULT_RULE = linux
ifeq ($(MAKECMDGOALS),qt)
DEFAULT_RULE = qt
TARGET_ARCHITECTURE = linux
endif
ifeq ($(MAKECMDGOALS),x11)
# TODO: take other X11 platforms into account. Or not.
DEFAULT_RULE = linux.x11
TARGET_ARCHITECTURE = linux
endif
@@ -81,7 +86,10 @@ else
$(TARGET): Makefile.$(TARGET_ARCHITECTURE) $(OBJS) ../../JGE/lib/linux/libjge.a
$(CXX) -o $(TARGET) $(OBJS) $(LIBS) $(LIBDIR)
linux: $(TARGET)
x11: $(TARGET)
qt: Makefile.qt
$(MAKE) -f Makefile.qt
debug: linux