Merge pull request #442 from easylogging/develop

Merge sample and travis CI fix
abumq · Jan 1, 2017 · f950313 · f950313
2 parents c452724 + 0fe5ad5
commit f950313
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/samples/STL/shared-static-libs/.gitignore b/samples/STL/shared-static-libs/.gitignore
@@ -5,4 +5,5 @@ myLib.a
 libmyLib.so
 logs/*
 myapp
+myapp.dSYM/*
 
diff --git a/samples/STL/shared-static-libs/compile_shared.sh b/samples/STL/shared-static-libs/compile_shared.sh
@@ -1,6 +1,6 @@
 rm -rf libmyLib.so lib/libmyLib.so lib/mylib.o lib/myLib.a myLib.a myapp logs ## Clean
 
-compiler=icpc
+compiler=g++
 standard=c++0x ## If this does not work try c++11 (depends on your compiler)
 macros="-DELPP_THREAD_SAFE -DELPP_STACKTRACE_ON_CRASH"  ## Macros for library
 
@@ -9,4 +9,4 @@ $compiler --std=$standard -pipe -fPIC -g -O0  $macros  -Iinclude  -c -o mylib.o
 $compiler -fPIC -g  -shared -o libmyLib.so mylib.o
 cp libmyLib.so ..
 cd ..
-$compiler -g -std=$standard -fPIC -pipe  -Wl,-rpath=lib -L lib myapp.cpp -Ilib/include -lmyLib  -o myapp
+$compiler -g -std=$standard -fPIC -pipe  -L lib myapp.cpp -Ilib/include -lmyLib  -o myapp
diff --git a/samples/STL/shared-static-libs/compile_static.sh b/samples/STL/shared-static-libs/compile_static.sh
@@ -1,6 +1,6 @@
 rm -rf libmyLib.so lib/libmyLib.so lib/mylib.o lib/myLib.a myLib.a myapp logs ## Clean
 
-compiler=icpc
+compiler=g++
 standard=c++0x ## If this does not work try c++11 (depends on your compiler)
 macros="-DELPP_THREAD_SAFE -DELPP_STACKTRACE_ON_CRASH"  ## Macros for library
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,5 @@ myLib.a @@
     libmyLib.so
     logs/*
     myapp
+    myapp.dSYM/*