From 2461420f15c71e7f3cecba1b39aa18cfe3c15248 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Wed, 14 Jun 2023 23:50:46 +0300 Subject: [PATCH] fucking conan --- .gitignore | 5 +---- Makefile | 7 +------ conanfile.py | 14 -------------- conanfile.txt | 5 ----- 4 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 conanfile.py delete mode 100644 conanfile.txt diff --git a/.gitignore b/.gitignore index 2d83326..7984e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -conan.lock -conanbuild* -conaninfo.txt -graph_info.json +make-libs-list diff --git a/Makefile b/Makefile index ea38457..2a01fa4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -include conanbuildinfo.mak - CC = clang CFLAGS = -O2 LIBS = -lcjson @@ -7,10 +5,7 @@ LIBS = -lcjson all: make-libs-list make-libs-list: - $(CC) $(CFLAGS) make-libs-list.c \ - $(LIBS) -I$(CONAN_INCLUDE_DIRS_CJSON) -L$(CONAN_LIB_DIRS_CJSON) \ - -o $@ + $(CC) $(CFLAGS) make-libs-list.c $(LIBS) -o $@ clean: rm make-libs-list - rm conanbuild* conaninfo.txt graph_info.json diff --git a/conanfile.py b/conanfile.py deleted file mode 100644 index 4a58f73..0000000 --- a/conanfile.py +++ /dev/null @@ -1,14 +0,0 @@ -from conans import ConanFile, MSBuild - -class ExampleConan(ConanFile): - name = "make-libs-list" - version = "1.0.1" - settings = "os", "arch", "build_type", "compiler" - options = {"shared": [True, False], "st": [True, False]} - default_options = {"shared": False, "st": False} - exports = "*" - _msvc_archs = {"x86": "x86", "x86_64": "x64"} - - def build(self): - msbuild = MSBuild(self) - msbuild.build("make-libs-list.vcxproj") diff --git a/conanfile.txt b/conanfile.txt deleted file mode 100644 index 9cd663a..0000000 --- a/conanfile.txt +++ /dev/null @@ -1,5 +0,0 @@ -[requires] -cjson/1.7.15 - -[generators] -make