Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: cpp
dist: bionic
addons:
apt:
packages:
- g++
- make
- libboost-all-dev
- libomp-dev
script:
- cd src
- make -f Makefiles/Makefile_linux_shared
- make install -f Makefiles/Makefile_linux_shared
- cd ../examples
- export LD_LIBRARY_PATH=$PWD
- cp Makefiles/Makefile_linux Makefile
- make
- ./AnalysePlayBin
4 changes: 2 additions & 2 deletions src/Makefiles/Makefile_linux_shared
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ clean:
install:
test -d ../test || mkdir ../test
test -d ../examples || mkdir ../examples
cp $(STATIC_LIB) ../test
cp $(STATIC_LIB) ../examples
cp $(SHARED_LIB) ../test
cp $(SHARED_LIB) ../examples

include $(INCL_DEPENDS)

3 changes: 2 additions & 1 deletion src/System.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ void System::GetHardware(
#ifdef __linux__
// The code for linux was suggested by Antony Lee.
FILE * fifo = popen(
"free -k | tail -n+3 | head -n1 | awk '{print $NF}'", "r");
"grep -Po 'MemAvailable:\\s*\\K[0-9]*' /proc/meminfo || "
"grep -Po 'MemFree:\\s*\\K[0-9]*' /proc/meminfo", "r");
int ignore = fscanf(fifo, "%llu", &kilobytesFree);
fclose(fifo);

Expand Down
3 changes: 0 additions & 3 deletions src/dds.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ extern "C" BOOL APIENTRY DllMain(
else if (ul_reason_for_call == DLL_PROCESS_DETACH)
{
CloseDebugFiles();
FreeMemory();
#ifdef DDS_MEMORY_LEAKS_WIN32
_CrtDumpMemoryLeaks();
#endif
Expand All @@ -59,7 +58,6 @@ void DDSInitialize(void)
void DDSFinalize(void)
{
CloseDebugFiles();
FreeMemory();
}

#elif defined(USES_CONSTRUCTOR)
Expand All @@ -73,7 +71,6 @@ static void __attribute__ ((constructor)) libInit(void)
static void __attribute__ ((destructor)) libEnd(void)
{
CloseDebugFiles();
FreeMemory();
}

#endif
Expand Down