diff options
| author | epoch <epoch@hacking.allowed.org> | 2020-05-16 16:42:48 -0500 |
|---|---|---|
| committer | epoch <epoch@hacking.allowed.org> | 2020-05-16 16:42:48 -0500 |
| commit | 764f141f28a6aada9d5bd0e27eb9c257fed17d17 (patch) | |
| tree | 3bae8568621264fe4a03f5841b2318eaecd960b8 | |
| parent | 922a17262416b57e4c8eb8a6a870a5a853576c32 (diff) | |
| parent | 7a8410dd0f819d0d723fb7c4edf09ef0e8dc489c (diff) | |
| download | hackvr-764f141f28a6aada9d5bd0e27eb9c257fed17d17.tar.gz hackvr-764f141f28a6aada9d5bd0e27eb9c257fed17d17.zip | |
Merge branch 'master' of ssh://21.41.41.1/~/hackvr
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | README | 28 | ||||
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/config.h | 4 |
4 files changed, 41 insertions, 7 deletions
@@ -12,9 +12,12 @@ clean: install: hackvr $(MAKE) -C src install + mkdir -p $(PREFIX)/bin install -t $(PREFIX)/bin bin/* + mkdir -p $(PREFIX)/share/applications install -t $(PREFIX)/share/applications share/applications/* - cp -r share/hackvr $(PREFIX)/share/hackvr + mkdir -p $(PREFIX)/share/hackvr/ + cp -r share/hackvr/* $(PREFIX)/share/hackvr/ uninstall: ## we'll assume PREFIX is set to the hackvr we want to uninstall @@ -34,11 +34,24 @@ libhashtable (LIBrary for HASH TABLEs.) You can usually get these libs from the same place you got hackvr. +where to find hackvr: +git://thebackupbox.net/hackvr +git://main.lv/hackvr +https://github.com/kkabrams/hackvr + +where to find libidc: +git://thebackupbox.net/libidc +git://main.lv/libidc +https://github.com/kkabrams/libidc + +where to find libhashtable: +git://thebackupbox.net/libhashtable +git://main.lv/libhashtable +https://github.com/kkabrams/libhashtable + I have a script that just runs make with PREFIX=$PREFIX prefix=$PREFIX so I end up with everything installed under ~/.local/ -like: -git://thebackupbox.net/libhashtable After you have that installed you should be able to do these to get hackvr built: @@ -48,6 +61,17 @@ After you have that installed you should be able to do these to get hackvr built The make install will create hackvr_headless, hackvr_x11, hackvr_fb. +If you didn't want to make install the libraries, there are variables you can set to +let the makefile know where they are: + +LIBIDC_INCLUDE_PATH +LIBIDC_LIB_PATH +LIBHASHTABLE_INCLUDE_PATH +LIBHASHTABLE_LIB_PATH + +They should be set to where the .h and .so are, and not a subdir like how $(PREFIX) is set +since the include and lib dirs don't exist inside the libs. + A few helper scripts are written in perl and python. So you might want to install perl and python if you want to play with them. They're pretty nifty. diff --git a/src/Makefile b/src/Makefile index 5803a1a..398aaa8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,12 +2,19 @@ PREFIX:=/usr/local/ -BASE_CFLAGS=-g -Wall -pedantic -std=c99 -ffast-math -I$(PREFIX)/include +### if you didn't install them after building, you can still point at them directly. +### right now, the header, and shared library are in their base dir, not lib or include subdirs. +LIBIDC_LIB_PATH:=$(PREFIX)/lib +LIBIDC_INCLUDE_PATH:=$(PREFIX)/include +LIBHASHTABLE_LIB_PATH:=$(PREFIX)/lib +LIBHASHTABLE_INCLUDE_PATH:=$(PREFIX)/include + +BASE_CFLAGS=-g -Wall -pedantic -std=c99 -ffast-math -I$(PREFIX)/include -I$(LIBIDC_INCLUDE_PATH) -I$(LIBHASHTABLE_INCLUDE_PATH) CFLAGS+=$(BASE_CFLAGS) CFLAGS+=-DGRAPHICAL -LDFLAGS+=-L$(PREFIX)/lib +LDFLAGS+=-L$(PREFIX)/lib -L$(LIBIDC_LIB_PATH) -L$(LIBHASHTABLE_LIB_PATH) #all: hackvr_headless hackvr_x11 hackvr_opengl slowcat ### when hackvr_opengl gets useful at all I'll start including it in default build. all: hackvr_fb hackvr_xdie hackvr_headless hackvr_x11 slowcat nonblocktail diff --git a/src/config.h b/src/config.h index c7c0af1..4df7467 100644 --- a/src/config.h +++ b/src/config.h @@ -17,9 +17,9 @@ #define PERIODIC_OUTPUT 100 #define MAX_SIDES 20 #define MAXWIDTH 4000 -#define WIDTH 320 +#define WIDTH 1024 #define MAXHEIGHT 3000 -#define HEIGHT 240 +#define HEIGHT 768 #define DEFAULT_MINIMAP 0 #define FORCE_REDRAW 0 |