Commit 1d2aa6e9 authored by neverlord's avatar neverlord

linux compatibility

parent f6810a13
...@@ -39,14 +39,17 @@ echo ...@@ -39,14 +39,17 @@ echo
echo "%.o : %.cpp \$(HEADERS)" echo "%.o : %.cpp \$(HEADERS)"
printf "%b\n" "\t\$(CXX) \$(CXXFLAGS) \$(INCLUDE_FLAGS) -fPIC -c \$< -o \$@" printf "%b\n" "\t\$(CXX) \$(CXXFLAGS) \$(INCLUDE_FLAGS) -fPIC -c \$< -o \$@"
echo echo
echo "\$(LIB_NAME) : \$(OBJECTS) \$(HEADERS)" echo "\$libcppa : \$(OBJECTS) \$(HEADERS)"
if test "$(uname)" "=" "Darwin" ; then if test "$(uname)" "=" "Darwin" ; then
printf "%b\n" "\t\$(CXX) \$(LIBS) -dynamiclib -o libcppa.dylib \$(OBJECTS)" printf "%b\n" "\t\$(CXX) \$(LIBS) -dynamiclib -o libcppa.dylib \$(OBJECTS)"
else else
printf "%b\n" "\t\$(CXX) \$(LIBS) -shared -Wl,-soname,libcppa.so.0 -o libcppa.so.0.0.0 \$(OBJECTS)" printf "%b\n" "\t\$(CXX) \$(LIBS) -shared -Wl,-soname,libcppa.so.0 -o libcppa.so.0.0.0 \$(OBJECTS)"
printf "%b\n" "\tln -s libcppa.so.0.0.0 libcppa.so.0.0"
printf "%b\n" "\tln -s libcppa.so.0.0.0 libcppa.so.0"
printf "%b\n" "\tln -s libcppa.so.0.0.0 libcppa.so"
fi fi
echo echo
echo "all : \$(LIB_NAME) \$(OBJECTS)" echo "all : libcppa \$(OBJECTS)"
echo echo
echo "clean:" echo "clean:"
printf "%b\n" "\trm -f \$(LIB_NAME) \$(OBJECTS)" printf "%b\n" "\trm -f \$(LIB_NAME) \$(OBJECTS)"
......
...@@ -30,9 +30,9 @@ const char* s_get_mac = ...@@ -30,9 +30,9 @@ const char* s_get_mac =
"/usr/bin/grep -Fw MAC | " "/usr/bin/grep -Fw MAC | "
"/usr/bin/grep -o '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}' | " "/usr/bin/grep -o '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}' | "
"/usr/bin/head -n1"; "/usr/bin/head -n1";
#elif CPPA_LINUX #elif defined(CPPA_LINUX)
const char* s_get_uuid = const char* s_get_uuid =
"/bin/egrep -o 'UUID=(([0-9a-fA-F-]+)(-[0-9a-fA-F-]+){3})\s+/\s+' " "/bin/egrep -o 'UUID=(([0-9a-fA-F-]+)(-[0-9a-fA-F-]+){3})\\s+/\\s+' "
"/etc/fstab | " "/etc/fstab | "
"/bin/egrep -o '([0-9a-fA-F-]+)(-[0-9a-fA-F-]+){3}'"; "/bin/egrep -o '([0-9a-fA-F-]+)(-[0-9a-fA-F-]+){3}'";
const char* s_get_mac = const char* s_get_mac =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment