mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 21:20:19 +00:00
96d1cc570e
The Command line execution of Subsurface happened before the GUI was created, this leaded to various bugs by me(tm) over time. This patch seems to fix all of those, by reusing the same code for GUI interaction and CommandLine interaction. I had to rework how the main.c worked, it used to be C code calling C++ code, and this is non desirable, since C doesn't really understand C++. I Moved all of C-related code to 'subsurfacestartup.c/h' and created a tiny wrapper to call it, so all of the C code is still C code, and the new main.cpp calls the mainwindow->loadFiles and mainWindow->importFiles to get rid of the bugs that happened before. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
160 lines
3.9 KiB
Makefile
160 lines
3.9 KiB
Makefile
NAME = subsurface
|
|
CAPITALIZED_NAME = Subsurface
|
|
TARGET = $(NAME)
|
|
|
|
include Configure.mk
|
|
VERSION=3.1
|
|
|
|
CC=gcc
|
|
CFLAGS=-Wall -Wno-pointer-sign -g $(CLCFLAGS) -DGSEAL_ENABLE
|
|
CXX=g++
|
|
CXXFLAGS=-Wall -g $(CLCXXFLAGS) $(MARBLEFLAGS)
|
|
INSTALL=install
|
|
|
|
# these locations seem to work for SuSE and Fedora
|
|
# prefix = $(HOME)
|
|
prefix = $(DESTDIR)/usr
|
|
BINDIR = $(prefix)/bin
|
|
DATADIR = $(prefix)/share
|
|
DOCDIR = $(DATADIR)/doc/$(NAME)
|
|
DESKTOPDIR = $(DATADIR)/applications
|
|
ICONPATH = $(DATADIR)/icons/hicolor
|
|
ICONDIR = $(ICONPATH)/scalable/apps
|
|
MANDIR = $(DATADIR)/man/man1
|
|
XSLTDIR = $(DATADIR)/$(NAME)/xslt
|
|
MARBLEDIR = marbledata/maps/earth/googlesat
|
|
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(ICONPATH)
|
|
|
|
ICONFILE = $(NAME)-icon.svg
|
|
DESKTOPFILE = $(NAME).desktop
|
|
MANFILES = $(NAME).1
|
|
XSLTFILES = xslt/*.xslt xslt/*.xsl
|
|
|
|
EXTRA_FLAGS = $(QTCXXFLAGS) $(GTKCFLAGS) $(GLIB2CFLAGS) $(XML2CFLAGS) \
|
|
$(LIBDIVECOMPUTERCFLAGS) \
|
|
$(LIBSOUPCFLAGS) $(GCONF2CFLAGS) -I.
|
|
|
|
HEADERS = \
|
|
qt-ui/divelistview.h \
|
|
qt-ui/maintab.h \
|
|
qt-ui/mainwindow.h \
|
|
qt-ui/models.h \
|
|
qt-ui/plotareascene.h \
|
|
qt-ui/starwidget.h \
|
|
qt-ui/modeldelegates.h \
|
|
qt-ui/profilegraphics.h \
|
|
qt-ui/globe.h \
|
|
qt-ui/kmessagewidget.h \
|
|
qt-ui/downloadfromdivecomputer.h \
|
|
qt-ui/preferences.h \
|
|
qt-ui/simplewidgets.h \
|
|
qt-ui/subsurfacewebservices.h \
|
|
qt-ui/divecomputermanagementdialog.h \
|
|
qt-ui/diveplanner.h \
|
|
qt-ui/about.h \
|
|
qt-ui/graphicsview-common.h \
|
|
qt-ui/printdialog.h \
|
|
qt-ui/printoptions.h \
|
|
qt-ui/printlayout.h \
|
|
qt-ui/completionmodels.h \
|
|
qt-ui/tableview.h
|
|
|
|
|
|
SOURCES = \
|
|
deco.c \
|
|
device.c \
|
|
dive.c \
|
|
divelist.c \
|
|
equipment.c \
|
|
file.c \
|
|
info.c \
|
|
main.cpp \
|
|
parse-xml.c \
|
|
planner.c \
|
|
subsurfacestartup.c \
|
|
profile.c \
|
|
save-xml.c \
|
|
sha1.c \
|
|
statistics.c \
|
|
time.c \
|
|
uemis.c \
|
|
uemis-downloader.c \
|
|
libdivecomputer.c \
|
|
qt-gui.cpp \
|
|
qthelper.cpp \
|
|
qt-ui/divelistview.cpp \
|
|
qt-ui/maintab.cpp \
|
|
qt-ui/mainwindow.cpp \
|
|
qt-ui/models.cpp \
|
|
qt-ui/plotareascene.cpp \
|
|
qt-ui/starwidget.cpp \
|
|
qt-ui/modeldelegates.cpp \
|
|
qt-ui/profilegraphics.cpp \
|
|
qt-ui/globe.cpp \
|
|
qt-ui/kmessagewidget.cpp \
|
|
qt-ui/downloadfromdivecomputer.cpp \
|
|
qt-ui/preferences.cpp \
|
|
qt-ui/simplewidgets.cpp \
|
|
qt-ui/subsurfacewebservices.cpp \
|
|
qt-ui/divecomputermanagementdialog.cpp \
|
|
qt-ui/diveplanner.cpp \
|
|
qt-ui/about.cpp \
|
|
qt-ui/graphicsview-common.cpp \
|
|
qt-ui/printdialog.cpp \
|
|
qt-ui/printoptions.cpp \
|
|
qt-ui/printlayout.cpp \
|
|
qt-ui/completionmodels.cpp \
|
|
qt-ui/tableview.cpp \
|
|
$(RESFILE)
|
|
|
|
|
|
RESOURCES = $(NAME).qrc
|
|
|
|
ifneq ($(SQLITE3FLAGS),)
|
|
EXTRA_FLAGS += -DSQLITE3 $(SQLITE3FLAGS)
|
|
endif
|
|
ifneq ($(ZIPFLAGS),)
|
|
EXTRA_FLAGS += -DLIBZIP $(ZIPFLAGS)
|
|
endif
|
|
ifneq ($(strip $(LIBXSLT)),)
|
|
EXTRA_FLAGS += -DXSLT='"$(XSLTDIR)"' $(XSLCFLAGS)
|
|
endif
|
|
ifeq ($(USE_GTK_UI),1)
|
|
ifneq ($(strip $(LIBOSMGPSMAP)),)
|
|
SOURCES += gps.c
|
|
EXTRA_FLAGS += -DHAVE_OSM_GPS_MAP $(OSMGPSMAPFLAGS)
|
|
endif
|
|
endif
|
|
|
|
ifneq (,$(filter $(UNAME),linux kfreebsd gnu))
|
|
SOURCES += linux.c
|
|
else ifeq ($(UNAME), darwin)
|
|
SOURCES += macos.c
|
|
MACOSXINSTALL = /Applications/$(CAPITALIZED_NAME).app
|
|
MACOSXFILES = packaging/macosx
|
|
MACOSXSTAGING = $(MACOSXFILES)/$(CAPITALIZED_NAME).app
|
|
INFOPLIST = $(MACOSXFILES)/Info.plist
|
|
INFOPLISTINPUT = $(INFOPLIST).in
|
|
LDFLAGS += -headerpad_max_install_names
|
|
else
|
|
SOURCES += windows.c
|
|
WINDOWSSTAGING = ./packaging/windows
|
|
WINMSGDIRS=$(addprefix share/locale/,$(shell ls po/*.po | sed -e 's/po\/\(..\)_.*/\1\/LC_MESSAGES/'))
|
|
NSIINPUTFILE = $(WINDOWSSTAGING)/$(NAME).nsi.in
|
|
NSIFILE = $(WINDOWSSTAGING)/$(NAME).nsi
|
|
MAKENSIS = makensis
|
|
XSLTDIR = .\\xslt
|
|
endif
|
|
|
|
LIBS = $(LIBQT) $(LIBXML2) $(LIBXSLT) $(LIBSQLITE3) $(LIBGCONF2) $(LIBDIVECOMPUTER) \
|
|
$(EXTRALIBS) $(LIBZIP) -lpthread -lm $(LIBOSMGPSMAP) $(LIBSOUP) $(LIBWINSOCK) $(MARBLELIBS)
|
|
|
|
MSGLANGS=$(notdir $(wildcard po/*.po))
|
|
|
|
# Add files to the following variables if the auto-detection based on the
|
|
# filename fails
|
|
OBJS_NEEDING_MOC =
|
|
OBJS_NEEDING_UIC =
|
|
HEADERS_NEEDING_MOC =
|
|
|
|
include Rules.mk
|