diff --git a/Dependencies/Sockets/pkgconfig/libSockets.pc b/Dependencies/Sockets/pkgconfig/libSockets.pc new file mode 100644 index 0000000..d1297ec --- /dev/null +++ b/Dependencies/Sockets/pkgconfig/libSockets.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libSockets +Description: C++ Sockets Library +Version: 2.3.9.3 +Requires: libxml-2.0, libssl +Libs: -L${libdir} -lSockets +Libs.private: -lpthread +Cflags: -I${includedir} diff --git a/Dependencies/Sockets/pkgconfig/libsockets2.pc b/Dependencies/Sockets/pkgconfig/libsockets2.pc new file mode 100644 index 0000000..a921504 --- /dev/null +++ b/Dependencies/Sockets/pkgconfig/libsockets2.pc @@ -0,0 +1,12 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: libsockets2 +Description: C++ Sockets Library +Version: 2.3.9.3 +Requires: +Libs: -L${libdir} -lSockets +Libs.private: -lssl -lcrypto -lxml2 -lpthread +Cflags: -I${includedir} diff --git a/Reality/Binaries/.gitignore b/Reality/Binaries/.gitignore index 2d9ce66..b2a9c43 100644 --- a/Reality/Binaries/.gitignore +++ b/Reality/Binaries/.gitignore @@ -1,4 +1,4 @@ - +Reality *.exe *.exp *.lib @@ -8,4 +8,4 @@ *.exp *.ilk *.lib -*.pdb \ No newline at end of file +*.pdb diff --git a/Reality/Source/Common.h b/Reality/Source/Common.h index 8982e18..7b08cb5 100644 --- a/Reality/Source/Common.h +++ b/Reality/Source/Common.h @@ -266,7 +266,7 @@ using boost::format; #endif #if PLATFORM != PLATFORM_WIN32 -#define Sleep(ms) usleep(1000*ms) +inline void Sleep(int ms) { usleep(1000*ms); } #endif class Database;