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 /src | |
| parent | 922a17262416b57e4c8eb8a6a870a5a853576c32 (diff) | |
| parent | 7a8410dd0f819d0d723fb7c4edf09ef0e8dc489c (diff) | |
| download | hackvr-764f141f28a6aada9d5bd0e27eb9c257fed17d17.tar.gz hackvr-764f141f28a6aada9d5bd0e27eb9c257fed17d17.zip | |
Merge branch 'master' of ssh://21.41.41.1/~/hackvr
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/config.h | 4 |
2 files changed, 11 insertions, 4 deletions
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 |