summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--README28
-rw-r--r--src/Makefile11
-rw-r--r--src/config.h4
4 files changed, 41 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 37ab95a..4aa96a3 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/README b/README
index 2fa43dd..a3a4ff3 100644
--- a/README
+++ b/README
@@ -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