cnping

Minimal Graphical Ping Tool
git clone https://git.sinitax.com/cnlohr/cnping
Log | Files | Refs | Submodules | README | LICENSE | sfeed.txt

commit 024417325cc95585d914c34bbb79d7b6a6a37749
parent afcc565771a37978eb0b54e185fa80482cdebe3a
Author: CNLohr <lohr85@gmail.com>
Date:   Sun, 22 Sep 2019 22:00:00 -0400

Merge pull request #59 from dreua/rawdraw_directory

Move rawdraw files to subdirectory.
Diffstat:
MMakefile | 10+++++-----
Mcnping.c | 4++--
Mcnping.exe | 0
Mhttping.c | 2+-
Mping.c | 2+-
RCNFGCocoaCGDriver.m -> rawdraw/CNFGCocoaCGDriver.m | 0
RCNFGFunctions.c -> rawdraw/CNFGFunctions.c | 0
RCNFGFunctions.h -> rawdraw/CNFGFunctions.h | 0
RCNFGRasterizer.h -> rawdraw/CNFGRasterizer.h | 0
RCNFGWinDriver.c -> rawdraw/CNFGWinDriver.c | 0
RCNFGXDriver.c -> rawdraw/CNFGXDriver.c | 0
Ros_generic.c -> rawdraw/os_generic.c | 0
Ros_generic.h -> rawdraw/os_generic.h | 0
Msearchnet.c | 2+-
14 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile @@ -10,17 +10,17 @@ LDFLAGS:=-g -L/opt/X11/lib/ #MINGW32:=/usr/bin/i686-w64-mingw32- MINGW32:=i686-w64-mingw32- -cnping.exe : cnping.c CNFGFunctions.c CNFGWinDriver.c os_generic.c ping.c httping.c +cnping.exe : cnping.c rawdraw/CNFGFunctions.c rawdraw/CNFGWinDriver.c rawdraw/os_generic.c ping.c httping.c $(MINGW32)windres resources.rc -o resources.o $(MINGW32)gcc -g -fno-ident -mwindows -m32 $(CFLAGS) resources.o -o $@ $^ -lgdi32 -lws2_32 -s -D_WIN32_WINNT=0x0600 -DWIN32 -cnping : cnping.o CNFGFunctions.o CNFGXDriver.o os_generic.o ping.o httping.o +cnping : cnping.o rawdraw/CNFGFunctions.o rawdraw/CNFGXDriver.o rawdraw/os_generic.o ping.o httping.o gcc $(CFLAGS) -o $@ $^ -lX11 -lm -lpthread $(LDFLAGS) -cnping_mac : cnping.c CNFGFunctions.c CNFGCocoaCGDriver.m os_generic.c ping.c httping.o +cnping_mac : cnping.c rawdraw/CNFGFunctions.c rawdraw/CNFGCocoaCGDriver.m rawdraw/os_generic.c ping.c httping.o gcc -o cnping $^ -x objective-c -framework Cocoa -framework QuartzCore -lm -lpthread -searchnet : os_generic.o ping.o searchnet.o +searchnet : rawdraw/os_generic.o ping.o searchnet.o gcc $(CFLAGS) -o $@ $^ -lpthread linuxinstall : cnping @@ -32,4 +32,4 @@ linuxinstall : cnping clean : rm -rf *.o *~ cnping cnping.exe cnping_mac searchnet - + rm -rf rawdraw/*.o diff --git a/cnping.c b/cnping.c @@ -18,8 +18,8 @@ #include <sys/select.h> #include <netdb.h> #endif -#include "CNFGFunctions.h" -#include "os_generic.h" +#include "rawdraw/CNFGFunctions.h" +#include "rawdraw/os_generic.h" #include "ping.h" #include "error_handling.h" #include "httping.h" diff --git a/cnping.exe b/cnping.exe Binary files differ. diff --git a/httping.c b/httping.c @@ -14,7 +14,7 @@ #include <netdb.h> #endif -#include "os_generic.h" +#include "rawdraw/os_generic.h" #include "error_handling.h" #ifndef MSG_NOSIGNAL diff --git a/ping.c b/ping.c @@ -9,7 +9,7 @@ #include <stdio.h> #include <stdlib.h> #include "ping.h" -#include "os_generic.h" +#include "rawdraw/os_generic.h" #include "error_handling.h" diff --git a/CNFGCocoaCGDriver.m b/rawdraw/CNFGCocoaCGDriver.m diff --git a/CNFGFunctions.c b/rawdraw/CNFGFunctions.c diff --git a/CNFGFunctions.h b/rawdraw/CNFGFunctions.h diff --git a/CNFGRasterizer.h b/rawdraw/CNFGRasterizer.h diff --git a/CNFGWinDriver.c b/rawdraw/CNFGWinDriver.c diff --git a/CNFGXDriver.c b/rawdraw/CNFGXDriver.c diff --git a/os_generic.c b/rawdraw/os_generic.c diff --git a/os_generic.h b/rawdraw/os_generic.h diff --git a/searchnet.c b/searchnet.c @@ -5,7 +5,7 @@ #include <arpa/inet.h> #include <stdint.h> #include <stdlib.h> -#include "os_generic.h" +#include "rawdraw/os_generic.h" uint32_t my_random_key; uint8_t send_id[4];