Diff

Differences From Artifact [a0a70506fb]:

To Artifact [9ef299ca9a]:


3
4
5
6
7
8
9
10
11
12
13
14
15
16
17



18
19
20
21
22
23
24
AR       = pnacl-ar
RANLIB   = pnacl-ranlib
FINALIZE = pnacl-finalize

CACKEY_LIBS = -Llib -lcackey -lz
PCSC_LIBS   = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp
LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
CFLAGS      = -Wall -g3 -ggdb3 -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude/PCSC
CXXFLAGS    = $(CFLAGS) -std=gnu++11
LDFLAGS     = -g3 -ggdb3

CACKEY_DEBUG = 0
ifeq (1,$(CACKEY_DEBUG))
CACKEY_LIBNAME     = libcackey_g
CACKEY_EXECUTABLES = cackey.pexe cackey.bc



else
CACKEY_LIBNAME     = libcackey
CACKEY_EXECUTABLES = cackey.pexe
endif

PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
export PATH







|

<





>
>
>







3
4
5
6
7
8
9
10
11

12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
AR       = pnacl-ar
RANLIB   = pnacl-ranlib
FINALIZE = pnacl-finalize

CACKEY_LIBS = -Llib -lcackey -lz
PCSC_LIBS   = -Llib -lpcsc -L${NACL_SDK_ROOT}/lib/pnacl/Release -lppapi -lppapi_cpp
LIBS        = $(CACKEY_LIBS) $(PCSC_LIBS)
CFLAGS      = -Wall -I${NACL_SDK_ROOT}/include -I../../pkcs11 -Iinclude/PCSC
CXXFLAGS    = $(CFLAGS) -std=gnu++11


CACKEY_DEBUG = 0
ifeq (1,$(CACKEY_DEBUG))
CACKEY_LIBNAME     = libcackey_g
CACKEY_EXECUTABLES = cackey.pexe cackey.bc
CFLAGS             += -g3 -ggdb3
CXXFLAGS           += -g3 -ggdb3
LDFLAGS            += -g3 -ggdb3
else
CACKEY_LIBNAME     = libcackey
CACKEY_EXECUTABLES = cackey.pexe
endif

PATH += :${NACL_SDK_ROOT}/toolchain/linux_pnacl/bin
export PATH