diff options
| author | geronimo <geronimo013@gmx.de> | 2012-08-15 05:33:17 +0200 |
|---|---|---|
| committer | geronimo <geronimo013@gmx.de> | 2012-08-15 05:33:17 +0200 |
| commit | 7eb41fd1431019f44227af6f5d707e7c98e0416e (patch) | |
| tree | 302b5e15e2d7deaf54921839de95423e785554c4 | |
| parent | e8175c7b23047fefd52f85afe05e2864b2a9bba8 (diff) | |
| download | cmp-7eb41fd1431019f44227af6f5d707e7c98e0416e.tar.gz cmp-7eb41fd1431019f44227af6f5d707e7c98e0416e.tar.bz2 | |
removed junit from client project and added -lcrypto to server makefile (fix for ubuntu)
| -rw-r--r-- | cmpcj/.classpath | 1 | ||||
| -rw-r--r-- | cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java | 3 | ||||
| -rw-r--r-- | cmps/nbproject/Makefile-Debug.mk | 2 | ||||
| -rw-r--r-- | cmps/nbproject/configurations.xml | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/cmpcj/.classpath b/cmpcj/.classpath index b28f98d..6c1a5de 100644 --- a/cmpcj/.classpath +++ b/cmpcj/.classpath @@ -4,7 +4,6 @@ <classpathentry kind="src" path="res"/> <classpathentry kind="lib" path="lib/glazedlists_java15.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="lib" path="lib/gson-2.2.2.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java b/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java index 8f69af0..4b46a13 100644 --- a/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java +++ b/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java @@ -7,7 +7,6 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import org.junit.Test; import com.google.gson.stream.JsonReader; import de.schwarzrot.cmpc.domain.Media; import de.schwarzrot.cmpc.domain.MediaType; @@ -35,7 +34,7 @@ public class MedialistParser { } - @Test + // @Test public void testJSonParsing() { FileInputStream fis = null; 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> |