forked from soutade/libgourou
Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
d9a920b062 |
|
@ -7,12 +7,3 @@ if [ ! -d lib/updfparser ] ; then
|
|||
make BUILD_STATIC=1 BUILD_SHARED=0
|
||||
popd
|
||||
fi
|
||||
|
||||
# OpenSSL legacy
|
||||
if [ ! -d lib/openssl ] ; then
|
||||
git clone --branch openssl-3.3 https://github.com/openssl/openssl.git lib/openssl
|
||||
pushd lib/openssl
|
||||
./Configure disable-apps disable-shared enable-legacy
|
||||
make -j4
|
||||
popd
|
||||
fi
|
||||
|
|
|
@ -859,14 +859,21 @@ namespace gourou
|
|||
std::string DRMProcessor::getDefaultAdeptDir(void)
|
||||
{
|
||||
#ifndef DEFAULT_ADEPT_DIR
|
||||
const char* user = getenv("USER");
|
||||
const char* home = getenv("HOME");
|
||||
|
||||
if (home)
|
||||
return home + std::string("/.config/adept/");
|
||||
else
|
||||
{
|
||||
const char* user = getenv("USER");
|
||||
|
||||
if (user && user[0])
|
||||
{
|
||||
return std::string("/home/") + user + std::string("/.config/adept/");
|
||||
}
|
||||
else
|
||||
return LOCAL_ADEPT_DIR;
|
||||
if (user && user[0])
|
||||
{
|
||||
return std::string("/home/") + user + std::string("/.config/adept/");
|
||||
}
|
||||
else
|
||||
return LOCAL_ADEPT_DIR;
|
||||
}
|
||||
#else
|
||||
return DEFAULT_ADEPT_DIR "/";
|
||||
#endif
|
||||
|
|
|
@ -10,7 +10,6 @@ CXXFLAGS=-Wall -fPIC -I$(ROOT)/include
|
|||
|
||||
STATIC_DEP=
|
||||
LDFLAGS += -L$(ROOT) -lcrypto -lzip -lz -lcurl -lpugixml
|
||||
LDFLAGS += -L$(ROOT) $(ROOT)/lib/openssl/libcrypto.a -lzip -lz -lcurl -lpugixml
|
||||
|
||||
ifneq ($(STATIC_UTILS),)
|
||||
STATIC_DEP = $(ROOT)/libgourou.a
|
||||
|
|
Loading…
Reference in New Issue
Block a user