taixingyiji/subconverter
1
0
Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2025-10-26 10:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile error on some platform

Browse Source 
Update build script.
This commit is contained in:
Tindy X
2020-02-24 00:19:50 +08:00
parent 24ef7f9e9e
commit 8ed0a620fd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build.alpine.release.sh
View File

@@ -8,11 +8,11 @@ apk add openssl-dev openssl-libs-static curl curl-dev curl-static nghttp2-static
git clone https://github.com/jbeder/yaml-cpp
cd yaml-cpp
cmake -DYAML_CPP_BUILD_TESTS=OFF -DYAML_CPP_BUILD_TOOLS=OFF . > /dev/null
make install -j4 > /dev/null
make install -j2 > /dev/null
cd ..
cmake .
make -j4
make -j2
g++ -o base/subconverter CMakeFiles/subconverter.dir/src/*.o -static -lpcre2-8 -levent -lyaml-cpp -lcurl -lnghttp2 -lssl -lcrypto -lz -lbz2 -ldl -lpthread -O3 -s
cd base

3
src/subexport.cpp
View File

@@ -13,6 +13,7 @@
#include <iostream>
#include <numeric>
#include <cmath>
#include <climits>
#include <rapidjson/writer.h>
#include <rapidjson/document.h>
#include <yaml-cpp/yaml.h>
@@ -249,7 +250,7 @@ bool matchRange(std::string &range, int target)
string_array vArray = split(range, ",");
bool match = false;
int range_begin = 0, range_end = 0;
const std::string reg_num = "\\d+", reg_range = "(\\d+)-(\\d+)", reg_not = "\\!(\\d+)", reg_not_range = "\\!(\\d+)-(\\d+)", reg_less = "(\\d+)-", reg_more = "(\\d+)\+";
const std::string reg_num = "\\d+", reg_range = "(\\d+)-(\\d+)", reg_not = "\\!(\\d+)", reg_not_range = "\\!(\\d+)-(\\d+)", reg_less = "(\\d+)-", reg_more = "(\\d+)\\+";
for(std::string &x : vArray)
{
if(regMatch(x, reg_num))