diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index f4859d0..338286e 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -2,9 +2,9 @@ name: Makefile CI (Test customfetch NOGUI) on: push: - branches: [ "main", "test", "windows" ] + branches: [ "main", "test", "android" ] pull_request: - branches: [ "main", "test", "windows" ] + branches: [ "main", "test", "android" ] jobs: build-deb: diff --git a/Makefile b/Makefile index 4dd5512..9cc23f8 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,6 @@ clean: rm -rf $(BUILDDIR)/$(TARGET) $(BUILDDIR)/libcustomfetch.a $(OBJ) distclean: - ./android/gradlew clean --project-dir=./android rm -rf $(BUILDDIR) ./tests/$(BUILDDIR) $(OBJ) find . -type f -name "*.tar.gz" -exec rm -rf "{}" \; find . -type f -name "*.o" -exec rm -rf "{}" \; diff --git a/src/main.cpp b/src/main.cpp index dc1dd4b..ed841bd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -349,7 +349,7 @@ system // clang-format off // parseargs() but only for parsing the user config path trough args // and so we can directly construct Config -static STRING_IF_ANDROID_APP_ELSE(bool) parse_config_path(int argc, char* argv[], const std::string& configDir) +static std::string parse_config_path(int argc, char* argv[], const std::string& configDir) { int opt = 0; int option_index = 0; @@ -638,4 +638,4 @@ int main(int argc, char *argv[]) #endif // !ANDROID_APP return _false; // 0 or "false" -} \ No newline at end of file +}