From 7eb41fd1431019f44227af6f5d707e7c98e0416e Mon Sep 17 00:00:00 2001
From: geronimo <geronimo013@gmx.de>
Date: Wed, 15 Aug 2012 05:33:17 +0200
Subject: removed junit from client project and added -lcrypto to server
 makefile (fix for ubuntu)

---
 cmps/nbproject/Makefile-Debug.mk  | 2 +-
 cmps/nbproject/configurations.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'cmps/nbproject')

diff --git a/cmps/nbproject/Makefile-Debug.mk b/cmps/nbproject/Makefile-Debug.mk
index d825972..4ae00ab 100644
--- a/cmps/nbproject/Makefile-Debug.mk
+++ b/cmps/nbproject/Makefile-Debug.mk
@@ -65,7 +65,7 @@ FFLAGS=
 ASFLAGS=
 
 # Link Libraries and Options
-LDLIBSOPTIONS=serverlib/dist/Debug/GNU-Linux-x86/libserverlib.a ../libs/mediaScan/dist/Debug/GNU-Linux-x86/libmediascan.a ../libs/networking/dist/Debug/GNU-Linux-x86/libnetworking.a ../libs/IO/dist/Debug/GNU-Linux-x86/libio.a ../libs/util/dist/Debug/GNU-Linux-x86/libutil.a ../libs/vdr/dist/Debug/GNU-Linux-x86/libvdr.a -lpthread -lrt -lssl -lpcrecpp -lmediainfo
+LDLIBSOPTIONS=serverlib/dist/Debug/GNU-Linux-x86/libserverlib.a ../libs/mediaScan/dist/Debug/GNU-Linux-x86/libmediascan.a ../libs/networking/dist/Debug/GNU-Linux-x86/libnetworking.a ../libs/IO/dist/Debug/GNU-Linux-x86/libio.a ../libs/util/dist/Debug/GNU-Linux-x86/libutil.a ../libs/vdr/dist/Debug/GNU-Linux-x86/libvdr.a -lpthread -lrt -lssl -lpcrecpp -lmediainfo -lcrypto
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
diff --git a/cmps/nbproject/configurations.xml b/cmps/nbproject/configurations.xml
index d2880dd..be330f2 100644
--- a/cmps/nbproject/configurations.xml
+++ b/cmps/nbproject/configurations.xml
@@ -183,6 +183,7 @@
             <linkerLibLibItem>ssl</linkerLibLibItem>
             <linkerLibLibItem>pcrecpp</linkerLibLibItem>
             <linkerLibLibItem>mediainfo</linkerLibLibItem>
+            <linkerLibLibItem>crypto</linkerLibLibItem>
           </linkerLibItems>
         </linkerTool>
         <requiredProjects>
-- 
cgit v1.2.3