TeaSpeak/TeaSpeak-Client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed for windows

Browse Source
This commit is contained in:
WolverinDEV 2019-11-24 23:14:12 +01:00
parent 814f529d99
commit e4c92aa827
11 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins/create_build.sh
View File

@ -117,8 +117,8 @@ function deploy_client() {
end_task "${project_name}_package" "Client successfully deployed!" end_task "${project_name}_package" "Client successfully deployed!"
} }
#install_npm install_npm
#compile_scripts compile_scripts
#compile_native compile_native
#package_client package_client
deploy_client deploy_client

3
native/dns/.vs/ProjectSettings.json Normal file
View File

@ -0,0 +1,3 @@
{
"CurrentProjectSetting": "No Configurations"
}

8
native/dns/.vs/VSWorkspaceState.json Normal file
View File

@ -0,0 +1,8 @@
{
"ExpandedNodes": [
"",
"\\src"
],
"SelectedNode": "\\src\\resolver.cpp",
"PreviewInSolutionExplorer": false
}

BIN
native/dns/.vs/dns/v16/.suo Normal file
View File

Binary file not shown.

BIN
native/dns/.vs/dns/v16/Browse.VC.db Normal file
View File

Binary file not shown.

BIN
native/dns/.vs/dns/v16/ipch/AutoPCH/1346297ee4e82e6/RESOLVER.ipch Normal file
View File

Binary file not shown.

BIN
native/dns/.vs/slnx.sqlite Normal file
View File

Binary file not shown.

2
native/serverconnection/CMakeLists.txt
View File

@ -124,7 +124,7 @@ set(REQUIRED_LIBRARIES
${ed25519_LIBRARIES_STATIC} ${ed25519_LIBRARIES_STATIC}
spdlog::spdlog spdlog::spdlog_header_only
Nan::Helpers Nan::Helpers
) )

2
native/serverconnection/src/connection/ft/FileTransferManager.cpp
View File

@ -1,5 +1,6 @@
#include "FileTransferManager.h" #include "FileTransferManager.h"
#include "FileTransferObject.h" #include "FileTransferObject.h"
#include <NanGet.h>
#include <misc/net.h> #include <misc/net.h>
#include <algorithm> #include <algorithm>
@ -8,7 +9,6 @@
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> #include <unistd.h>
#include <misc/net.h> #include <misc/net.h>
#include <include/NanGet.h>
#ifndef IPPROTO_TCP #ifndef IPPROTO_TCP
#define IPPROTO_TCP (0) #define IPPROTO_TCP (0)

3
native/serverconnection/src/logger.h
View File

@ -8,7 +8,7 @@
#include <vector> #include <vector>
#include <functional> #include <functional>
namespace logger { namespace tc_logger {
namespace level = spdlog::level; namespace level = spdlog::level;
namespace category { namespace category {
@ -90,6 +90,7 @@ namespace logger {
} }
} }
namespace logger = tc_logger;
namespace category = logger::category; namespace category = logger::category;
#define tr(message) message #define tr(message) message

2
package.json
View File

@ -54,7 +54,7 @@
"electron-navigation": "^1.5.8", "electron-navigation": "^1.5.8",
"electron-rebuild": "^1.8.6", "electron-rebuild": "^1.8.6",
"electron-winstaller": "^2.7.0", "electron-winstaller": "^2.7.0",
"electron-wix-msi": "^2.1.1", "electron-wix-msi": "^2.2.0",
"extend": "^3.0.2", "extend": "^3.0.2",
"extsprintf": "^1.4.0", "extsprintf": "^1.4.0",
"fs-extra": "^8.1.0", "fs-extra": "^8.1.0",