extract file names to global defs

This commit is contained in:
Shawn Chain 2018-10-05 20:18:42 +08:00
parent 67e45b1bf1
commit 169db8e466
5 changed files with 29 additions and 13 deletions

View file

@ -15,7 +15,7 @@
#define DStarDefines_H
#include <wx/wx.h>
#include "GlobalDefines.h"
#include "../GlobalDefines.h"
const unsigned int DSTAR_GMSK_SYMBOL_RATE = 4800U;
const float DSTAR_GMSK_BT = 0.5F;

View file

@ -1,11 +1,25 @@
#ifndef __GLOBAL_DEFS__
#define __GLOBAL_DEFS__
#ifndef DATA_DIR
#define DATA_DIR "/etc/mmdvm/ircddbgateway"
#if defined(__APPLE__)
#define DATA_DIR "/etc/mmdvm/dstar"
#define LOG_DIR "/var/log/mmdvm"
#define CONF_DIR "/etc"
#define BIN_DIR "/usr/bin"
#endif
#define CONF_FILE "ircDDBGateway.ini"
#define LOG_BASE "ircDDBGateway"
#elif defined(OPENWRT) && OPENWRT == 1
#define DATA_DIR "/etc/mmdvm/dstar"
#define LOG_DIR "/var/log/mmdvm"
#define CONF_DIR "/etc"
#define CONF_FILE "ircDDBGateway.ini"
#define LOG_BASE "ircDDBGateway"
#else
#define DATA_DIR "/usr/share/ircddbgateway"
#define LOG_DIR "/tmp"
#define CONF_DIR "/etc"
#define CONF_FILE "ircddbgateway"
#define LOG_BASE "ircddbgateway"
#endif

View file

@ -1,9 +1,8 @@
# CXX := $(shell wx-config --cxx)
# CFLAGS := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)'
# GUILIBS := $(shell wx-config --libs adv,core,base)
# LIBS := $(shell wx-config --libs base)
# LDFLAGS :=
# export CXX ?= $(shell wx-config --cxx)
# export CFLAGS ?= -O2 -Wall $(shell wx-config --cxxflags)
# export GUILIBS ?= $(shell wx-config --libs adv,core,base)
# export LIBS ?= $(shell wx-config --libs base)
# export LDFLAGS ?=
all: ircDDBGateway/ircddbgatewayd

View file

@ -42,13 +42,15 @@
#include <signal.h>
#include <fcntl.h>
#include "../GlobalDefines.h"
const wxChar* NAME_PARAM = wxT("Gateway Name");
const wxChar* NOLOGGING_SWITCH = wxT("nolog");
const wxChar* LOGDIR_OPTION = wxT("logdir");
const wxChar* CONFDIR_OPTION = wxT("confdir");
const wxChar* DAEMON_SWITCH = wxT("daemon");
const wxString LOG_BASE_NAME = wxT("ircddbgatewayd");
const wxString LOG_BASE_NAME = wxT("LOG_BASE");
static CIRCDDBGatewayAppD* m_gateway = NULL;

View file

@ -20,10 +20,11 @@
#define IRCDDBGatewayDefs_H
#include <wx/wx.h>
#include "../GlobalDefines.h"
const wxString APPLICATION_NAME = wxT("ircDDB Gateway");
const wxString CONFIG_FILE_NAME = wxT("ircDDBGateway.ini");
const wxString CONFIG_FILE_NAME = wxT(CONF_FILE);
const wxString STATUS1_FILE_NAME = wxT("status1.txt");
const wxString STATUS2_FILE_NAME = wxT("status2.txt");