Browse Source

second instance for testing

ENGINE-96
Volker Birk 6 years ago
parent
commit
c249047914
3 changed files with 11 additions and 3 deletions
  1. +6
    -0
      Makefile.conf
  2. +3
    -3
      src/Makefile
  3. +2
    -0
      src/platform_unix.c

+ 6
- 0
Makefile.conf View File

@ -18,3 +18,9 @@ ASN1C_INCLUDE=/opt/local/share/asn1c
# DEFAULT_KEYSERVER - string with default keyserver
# CRASHDUMP_DEFAULT_LINES - number of log lines to deliver for crashdumps
#EXTRAMACROS=-DDEFAULT_KEYSERVER=\"default-server.org\" -DCRASHDUMP_DEFAULT_LINES=23
# second instance for testing
EXTRAMACROS=-DLOCAL_DB_FILENAME=\".pEp_management2.db\"
TARGET=libpEpEngine2.dylib

+ 3
- 3
src/Makefile View File

@ -5,14 +5,14 @@ OPENPGP?=GPG
ifeq ($(BUILD_ON),Darwin)
ifeq ($(BUILD_FOR),Darwin)
TARGET=libpEpEngine.dylib
TARGET?=libpEpEngine.dylib
MACOSX_VERSION_MIN=10.6
GPGME_IN=$(HOME)
LIBGPGME=libgpgme-pthread.dylib
CC?=clang -std=c99 -pthread
LD?=clang
CFLAGS?=-I$(GPGME_IN)/include -I$(HOME)/include -I/opt/local/include $(OPTIMIZE) -pedantic \
-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -I../asn.1
-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" -I../asn.1 $(EXTRAMACROS)
LDFLAGS?=-lc -shared -arch x86_64 \
-L$(HOME)/lib -L/usr/lib -L/opt/local/lib -letpan -lsqlite3 -L../asn.1 -lasn1 -lz -liconv
@ -29,7 +29,7 @@ LIBGPGME=libgpgme.so.11
CC=gcc -std=c99
CFLAGS?=-I$(GPGME_IN)/include $(OPTIMIZE) -fPIC -pedantic \
-DSYSTEM_DB=\"$(SYSTEM_DB)\" -DLIBGPGME=\"$(LIBGPGME)\" \
-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1
-DSQLITE_THREADSAFE=1 -D_GNU_SOURCE -I../asn.1 $(EXTRAMACROS)
LDFLAGS?=-L$(GPGME_IN)/lib -shared -lc -ldl -letpan -lpthread -L../asn.1 -lasn1
else


+ 2
- 0
src/platform_unix.c View File

@ -11,7 +11,9 @@
#include "platform_unix.h"
#define MAX_PATH 1024
#ifndef LOCAL_DB_FILENAME
#define LOCAL_DB_FILENAME ".pEp_management.db"
#endif
#define SYSTEM_DB_FILENAME "system.db"
#ifndef bool


Loading…
Cancel
Save