summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--csv/csv.cpp (renamed from ftnoir_csv/csv.cpp)0
-rw-r--r--csv/csv.h (renamed from ftnoir_csv/csv.h)0
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.cpp2
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.cpp2
5 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5325f673..335eab80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,7 +224,7 @@ if(NOT WIN32 AND NOT APPLE)
target_link_libraries(opentrack-compat rt)
endif()
-opentrack_module(opentrack-csv ftnoir_csv)
+opentrack_module(opentrack-csv csv)
add_library(opentrack-csv STATIC ${opentrack-csv-c})
target_link_libraries(opentrack-csv ${MY_QT_LIBS})
diff --git a/ftnoir_csv/csv.cpp b/csv/csv.cpp
index 71db8ecb..71db8ecb 100644
--- a/ftnoir_csv/csv.cpp
+++ b/csv/csv.cpp
diff --git a/ftnoir_csv/csv.h b/csv/csv.h
index e0eac7dd..e0eac7dd 100644
--- a/ftnoir_csv/csv.h
+++ b/csv/csv.h
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
index 2dd10d1d..08d41897 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.cpp
@@ -25,7 +25,7 @@
* to games, using the FreeTrackClient.dll.
********************************************************************************/
#include "ftnoir_protocol_ft.h"
-#include "ftnoir_csv/csv.h"
+#include "csv/csv.h"
FTNoIR_Protocol::FTNoIR_Protocol() :
shm(FREETRACK_HEAP, FREETRACK_MUTEX, sizeof(FTHeap)),
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
index db030554..5f80944a 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
@@ -3,7 +3,7 @@
#include <sys/mman.h>
#include <sys/stat.h> /* For mode constants */
#include <fcntl.h> /* For O_* constants */
-#include "ftnoir_csv/csv.h"
+#include "csv/csv.h"
FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
{