mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 20:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify building

Browse Source
This commit is contained in:
radius 2016-11-19 20:18:44 -05:00
parent 9a163164f3
commit 26d0a6f2d0
5 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.common
View File

@ -272,8 +272,12 @@ endif
# Qt # Qt
ifeq ($(HAVE_QT_WRAPPER), 1)
LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/obj/
LIBS += -lwrapper
endif
ifeq ($(HAVE_QT), 1) ifeq ($(HAVE_QT), 1)
HAVE_QT_WRAPPER=0
OBJ += ui/drivers/ui_qt.o \ OBJ += ui/drivers/ui_qt.o \
ui/drivers/qt/ui_qt_application.o \ ui/drivers/qt/ui_qt_application.o \
ui/drivers/qt/ui_qt_window.o \ ui/drivers/qt/ui_qt_window.o \
@ -283,13 +287,6 @@ OBJ += ui/drivers/ui_qt.o \
ifneq ($(findstring Linux,$(OS)),) ifneq ($(findstring Linux,$(OS)),)
DEFINES += -I/usr/include/qt -fPIC DEFINES += -I/usr/include/qt -fPIC
endif endif
# TODO/FIXME - figure out which libraries we need to link against
LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/wrapper/build/release
ifeq ($(HAVE_QT_WRAPPER), 1)
LIBS += -lwrapper
endif
endif endif
ifeq ($(HAVE_SSA),1) ifeq ($(HAVE_SSA),1)

1
qb/config.params.sh
View File

@ -80,6 +80,7 @@ HAVE_PARPORT=auto # Parallel port joypad support
HAVE_IMAGEVIEWER=yes # Built-in image viewer support. HAVE_IMAGEVIEWER=yes # Built-in image viewer support.
HAVE_MMAP=auto # MMAP support HAVE_MMAP=auto # MMAP support
HAVE_QT=no # QT companion support HAVE_QT=no # QT companion support
HAVE_QT_WRAPPER=no
HAVE_XSHM=no # XShm video driver support HAVE_XSHM=no # XShm video driver support
HAVE_CHEEVOS=yes # Retro Achievements HAVE_CHEEVOS=yes # Retro Achievements
HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines HAVE_SHADERPIPELINE=yes # Additional shader-based pipelines

17
ui/drivers/qt/wimp-test/wimp-test.pro
View File

@ -1,11 +1,22 @@
TARGET = wimp-test TARGET = wimp-test
CONFIG += console CONFIG += console
SOURCES += main.cpp SOURCES += main.cpp
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lwimp.dll Release:DESTDIR = ../build/release
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll Release:OBJECTS_DIR = ../build/release/obj
Release:MOC_DIR = ../build/release/moc
Release:RCC_DIR = ../build/release/rcc
Release:UI_DIR = ../build/release/ui
Debug:DESTDIR = ../build/debug
Debug:OBJECTS_DIR = ../build/debug/obj
Debug:MOC_DIR = ../build/debug/moc
Debug:RCC_DIR = ../build/debug/rcc
Debug:UI_DIR = ../build/debug/ui
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/build/debug/ -lwimp.dll
else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwrapper.dll win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwrapper.dll

11
ui/drivers/qt/wimp/wimp.pro
View File

@ -21,6 +21,17 @@ HEADERS +=\
RESOURCES += \ RESOURCES += \
qml.qrc qml.qrc
Release:DESTDIR = ../build/release
Release:OBJECTS_DIR = ../build/release/obj
Release:MOC_DIR = ../build/release/moc
Release:RCC_DIR = ../build/release/rcc
Release:UI_DIR = ../build/release/ui
Debug:DESTDIR = ../build/debug
Debug:OBJECTS_DIR = ../build/debug/obj
Debug:MOC_DIR = ../build/debug/moc
Debug:RCC_DIR = ../build/debug/rcc
Debug:UI_DIR = ../build/debug/ui
INCLUDEPATH += $$PWD/../../../../ INCLUDEPATH += $$PWD/../../../../
INCLUDEPATH += $$PWD/../../../../libretro-common/include/ INCLUDEPATH += $$PWD/../../../../libretro-common/include/

12
ui/drivers/qt/wrapper/wrapper.pro
View File

@ -14,6 +14,18 @@ HEADERS += \
wrapper.h wrapper.h
Release:DESTDIR = ../build/release
Release:OBJECTS_DIR = ../build/release/obj
Release:MOC_DIR = ../build/release/moc
Release:RCC_DIR = ../build/release/rcc
Release:UI_DIR = ../build/release/ui
Debug:DESTDIR = ../build/debug
Debug:OBJECTS_DIR = ../build/debug/obj
Debug:MOC_DIR = ../build/debug/moc
Debug:RCC_DIR = ../build/debug/rcc
Debug:UI_DIR = ../build/debug/ui
win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.dll else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.dll
else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so