liliesh/netbenixCMD
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/netbenix/netbenixCMD into dev

Browse source 
# Conflicts:
#	.gitignore
#	etc/man.c
#	etc/your-reality.c
#	etc/your-reality.h
#	main.c
#	makefile
This commit is contained in:
netbenix 2020-11-19 12:35:12 +01:00
commit 9caca5a4fb
9 changed files with 176 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

7
makefile
View file

@ -2,7 +2,11 @@ CC= gcc
ARGS= -export-dynamic -ansi -std=gnu99
CFLAGS= $(shell pkg-config --cflags gtk+-3.0) -I/usr/include/mysql
LDLIBS= $(shell pkg-config --libs gtk+-3.0) -L/usr/lib/mysql -lmysqlclient
<<<<<<< HEAD
OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o math.o
=======
OBJ= main.o logo.o logger.o help.o sys_info.o gtk_test.o sql_test.o show_dir.o change_dir.o update_check.o man.o your-reality.o
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
netbenixCMD: $(OBJ)
$(CC) $(CFLAGS) $(ARGS) -o netbenixCMD $(OBJ) $(LDLIBS)
@ -28,7 +32,10 @@ update_check.o: utils/update_check.c
$(CC) $(CFLAGS) -c utils/update_check.c
man.o: etc/man.c
$(CC) $(CFLAGS) -c etc/man.c
<<<<<<< HEAD
math.o: etc/math.c
$(CC) $(CFLAGS) -c etc/math.c
=======
>>>>>>> f1cf6269f94065bfb8498dd7ef06bfbb61442b80
your-reality.o: etc/your-reality.c
$(CC) $(CFLAGS) -c etc/your-reality.c