5b5840a79e
Previously, all Conversations/Contacts/Users were stored in the Server, each in their respective KeyMaps, identified solely by their identifiers. This leads to the glaring problem of overlap― if the user has multiple accounts, some users/rooms might be used or present in multiple accounts at the same time. Now, each accounts' Contacts, Conversations, and Users are stored in its ProtocolLooper, making this overlap impossible. An oversight of only allowing one user identifier to be stored (fMySelf) in Server was also fixed this way. This is the bulk of the work required for multi-account support― now, the user can join the same XMPP room on two seperate accounts, and it works perfectly.
183 lines
6.7 KiB
Makefile
183 lines
6.7 KiB
Makefile
## Haiku Generic Makefile v2.6 ##
|
|
|
|
## Fill in this file to specify the project being created, and the referenced
|
|
## Makefile-Engine will do all of the hard work for you. This handles any
|
|
## architecture of Haiku.
|
|
##
|
|
## For more information, see:
|
|
## file:///system/develop/documentation/makefile-engine.html
|
|
|
|
# The name of the binary.
|
|
NAME = Caya
|
|
|
|
# The type of binary, must be one of:
|
|
# APP: Application
|
|
# SHARED: Shared library or add-on
|
|
# STATIC: Static library archive
|
|
# DRIVER: Kernel driver
|
|
TYPE = APP
|
|
|
|
# If you plan to use localization, specify the application's MIME signature.
|
|
APP_MIME_SIG = application/x-vnd.caya.Caya
|
|
|
|
# The following lines tell Pe and Eddie where the SRCS, RDEFS, and RSRCS are
|
|
# so that Pe and Eddie can fill them in for you.
|
|
#%{
|
|
# @src->@
|
|
|
|
# Specify the source files to use. Full paths or paths relative to the
|
|
# Makefile can be included. All files, regardless of directory, will have
|
|
# their object files created in the common object directory. Note that this
|
|
# means this Makefile will not work correctly if two source files with the
|
|
# same name (source.c or source.cpp) are included from different directories.
|
|
# Also note that spaces in folder names do not work well with this Makefile.
|
|
SRCS = \
|
|
application/Account.cpp \
|
|
application/AccountManager.cpp \
|
|
application/CayaProtocolAddOn.cpp \
|
|
application/CayaUtils.cpp \
|
|
application/Contact.cpp \
|
|
application/Conversation.cpp \
|
|
application/EditingFilter.cpp \
|
|
application/ImageCache.cpp \
|
|
application/Main.cpp \
|
|
application/Notifier.cpp \
|
|
application/ProtocolLooper.cpp \
|
|
application/ProtocolManager.cpp \
|
|
application/ProtocolSettings.cpp \
|
|
application/Server.cpp \
|
|
application/TheApp.cpp \
|
|
application/User.cpp \
|
|
application/preferences/AccountDialog.cpp \
|
|
application/preferences/AccountListItem.cpp \
|
|
application/preferences/AccountView.cpp \
|
|
application/preferences/CayaPreferences.cpp \
|
|
application/preferences/PreferencesChatWindow.cpp \
|
|
application/preferences/PreferencesAccounts.cpp \
|
|
application/preferences/PreferencesBehavior.cpp \
|
|
application/preferences/PreferencesReplicant.cpp \
|
|
application/views/CayaRenderView.cpp \
|
|
application/views/ConversationItem.cpp \
|
|
application/views/ConversationListView.cpp \
|
|
application/views/ConversationView.cpp \
|
|
application/views/InviteDialogue.cpp \
|
|
application/views/NicknameTextControl.cpp \
|
|
application/views/ReplicantStatusView.cpp \
|
|
application/views/ReplicantMenuItem.cpp \
|
|
application/views/RosterItem.cpp \
|
|
application/views/RosterListView.cpp \
|
|
application/views/SearchBarTextControl.cpp \
|
|
application/views/StatusMenuItem.cpp \
|
|
application/views/StatusView.cpp \
|
|
application/views/UserItem.cpp \
|
|
application/views/UserListView.cpp \
|
|
application/views/UserPopUp.cpp \
|
|
application/windows/AboutWindow.cpp \
|
|
application/windows/JoinWindow.cpp \
|
|
application/windows/MainWindow.cpp \
|
|
application/windows/PreferencesWindow.cpp \
|
|
application/windows/RosterWindow.cpp \
|
|
application/windows/UserInfoWindow.cpp
|
|
|
|
|
|
# Specify the resource definition files to use. Full or relative paths can be
|
|
# used.
|
|
RDEFS = Caya.rdef
|
|
|
|
# Specify the resource files to use. Full or relative paths can be used.
|
|
# Both RDEFS and RSRCS can be utilized in the same Makefile.
|
|
RSRCS =
|
|
|
|
# End Pe/Eddie support.
|
|
# @<-src@
|
|
#%}
|
|
|
|
# Specify libraries to link against.
|
|
# There are two acceptable forms of library specifications:
|
|
# - if your library follows the naming pattern of libXXX.so or libXXX.a,
|
|
# you can simply specify XXX for the library. (e.g. the entry for
|
|
# "libtracker.so" would be "tracker")
|
|
#
|
|
# - for GCC-independent linking of standard C++ libraries, you can use
|
|
# $(STDCPPLIBS) instead of the raw "stdc++[.r4] [supc++]" library names.
|
|
#
|
|
# - if your library does not follow the standard library naming scheme,
|
|
# you need to specify the path to the library and it's name.
|
|
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
|
|
LIBS = be expat interface runview shared support translation $(STDCPPLIBS)
|
|
|
|
|
|
# Specify additional paths to directories following the standard libXXX.so
|
|
# or libXXX.a naming scheme. You can specify full paths or paths relative
|
|
# to the Makefile. The paths included are not parsed recursively, so
|
|
# include all of the paths where libraries must be found. Directories where
|
|
# source files were specified are automatically included.
|
|
LIBPATHS =
|
|
|
|
# Additional paths to look for system headers. These use the form
|
|
# "#include <header>". Directories that contain the files in SRCS are
|
|
# NOT auto-included here.
|
|
SYSTEM_INCLUDE_PATHS = libs/
|
|
|
|
# Additional paths paths to look for local headers. These use the form
|
|
# #include "header". Directories that contain the files in SRCS are
|
|
# automatically included.
|
|
LOCAL_INCLUDE_PATHS =
|
|
|
|
# Specify the level of optimization that you want. Specify either NONE (O0),
|
|
# SOME (O1), FULL (O3), or leave blank (for the default optimization level).
|
|
OPTIMIZE :=
|
|
|
|
# Specify the codes for languages you are going to support in this
|
|
# application. The default "en" one must be provided too. "make catkeys"
|
|
# will recreate only the "locales/en.catkeys" file. Use it as a template
|
|
# for creating catkeys for other languages. All localization files must be
|
|
# placed in the "locales" subdirectory.
|
|
LOCALES =
|
|
|
|
# Specify all the preprocessor symbols to be defined. The symbols will not
|
|
# have their values set automatically; you must supply the value (if any) to
|
|
# use. For example, setting DEFINES to "DEBUG=1" will cause the compiler
|
|
# option "-DDEBUG=1" to be used. Setting DEFINES to "DEBUG" would pass
|
|
# "-DDEBUG" on the compiler's command line.
|
|
DEFINES :=
|
|
|
|
# Specify the warning level. Either NONE (suppress all warnings),
|
|
# ALL (enable all warnings), or leave blank (enable default warnings).
|
|
WARNINGS =
|
|
|
|
# With image symbols, stack crawls in the debugger are meaningful.
|
|
# If set to "TRUE", symbols will be created.
|
|
SYMBOLS :=
|
|
|
|
# Includes debug information, which allows the binary to be debugged easily.
|
|
# If set to "TRUE", debug info will be created.
|
|
DEBUGGER :=
|
|
|
|
# Specify any additional compiler flags to be used.
|
|
COMPILER_FLAGS =
|
|
|
|
# Specify any additional linker flags to be used.
|
|
LINKER_FLAGS =
|
|
|
|
# Specify the version of this binary. Example:
|
|
# -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL"
|
|
# This may also be specified in a resource.
|
|
APP_VERSION :=
|
|
|
|
# (Only used when "TYPE" is "DRIVER"). Specify the desired driver install
|
|
# location in the /dev hierarchy. Example:
|
|
# DRIVER_PATH = video/usb
|
|
# will instruct the "driverinstall" rule to place a symlink to your driver's
|
|
# binary in ~/add-ons/kernel/drivers/dev/video/usb, so that your driver will
|
|
# appear at /dev/video/usb when loaded. The default is "misc".
|
|
DRIVER_PATH =
|
|
|
|
## Include the Makefile-Engine
|
|
DEVEL_DIRECTORY := /boot/system/develop/
|
|
include $(DEVEL_DIRECTORY)/etc/makefile-engine
|
|
|
|
include Makefile.common
|
|
|
|
CC = g++
|