From d00cf5f8fdd18a5ef0dfbfa8a24db360d4c16029 Mon Sep 17 00:00:00 2001 From: epoch Date: Fri, 17 Jul 2020 03:41:27 -0500 Subject: hackvr_svg? what kind of madness is this? --- src/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 398aaa8..3588d10 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ CFLAGS+=-DGRAPHICAL 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 +all: hackvr_svg hackvr_fb hackvr_xdie hackvr_headless hackvr_x11 slowcat nonblocktail # hackvr_fb hackvr_freeglut slowcat hackvr_xdie: override LDLIBS+=-lm -lidc -lX11 -lhashtable @@ -32,6 +32,9 @@ hackvr_headless: hackvr_headless.o math.o physics.o hackvr_x11: override LDLIBS+=-lm -lidc -lX11 -lhashtable hackvr_x11: hackvr_x11.o graphics_c3.o graphics_c2.o graphics_cs_x11.o math.o physics.o keyboard.o mouse_x11.o keyboard_x11.o +hackvr_svg: override LDLIBS+=-lm -lidc -lhashtable +hackvr_svg: hackvr_svg.o graphics_c3.o graphics_c2.o graphics_cs_svg.o math.o physics.o keyboard.o keyboard_die.o mouse_die.o + #notice how all the targets have generic graphics objects up until a specific one. hackvr_fb: override LDLIBS+=-lm -lidc -lhashtable @@ -46,6 +49,7 @@ hackvr_freeglut: hackvr_freeglut.o graphics_c3_freeglut.o math.o physics.o keybo hackvr_fb.o: CFLAGS+='-DHVR_VERSION="framebuffer"' hackvr_x11.o: CFLAGS+='-DHVR_VERSION="x11"' hackvr_xdie.o: CFLAGS+='-DHVR_VERSION="x11+die"' +hackvr_svg.o: CFLAGS+='-DHVR_VERSION="svg"' hackvr_headless.o: CFLAGS=$(BASE_CFLAGS) hackvr_headless.o: CFLAGS+='-DHVR_VERSION="headless"' @@ -57,6 +61,7 @@ install: all install -t $(PREFIX)/bin nonblocktail install -t $(PREFIX)/bin hackvr_xdie install -t $(PREFIX)/bin hackvr_fb + install -t $(PREFIX)/bin hackvr_svg # install -t $(PREFIX)/bin hackvr_freeglut uninstall: -- cgit v1.2.3 From c27f40e7f2d20b0a576ece53e9bdeacc7b40da9e Mon Sep 17 00:00:00 2001 From: epoch Date: Fri, 9 Oct 2020 18:47:59 -0500 Subject: make was not working on my laptop. adding override to a bunch of lines made it work. bugs may ensue. --- src/Makefile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 3588d10..6187723 100644 --- a/src/Makefile +++ b/src/Makefile @@ -11,15 +11,18 @@ 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 +override CFLAGS+=$(BASE_CFLAGS) +override CFLAGS+=-DGRAPHICAL -LDFLAGS+=-L$(PREFIX)/lib -L$(LIBIDC_LIB_PATH) -L$(LIBHASHTABLE_LIB_PATH) +override 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_svg hackvr_fb hackvr_xdie hackvr_headless hackvr_x11 slowcat nonblocktail +all: hackvr_svg hackvr_fb hackvr_xdie hackvr_headless hackvr_x11 slowcat nonblocktail hackvr_xdiewii # hackvr_fb hackvr_freeglut slowcat +hackvr_xdiewii: override LDLIBS+=-lm -lidc -lX11 -lhashtable +hackvr_xdiewii: hackvr_xdiewii.o graphics_c3.o graphics_c2.o graphics_cs_x11.o math.o physics.o keyboard.o mouse_wii.o keyboard_x11.o + hackvr_xdie: override LDLIBS+=-lm -lidc -lX11 -lhashtable hackvr_xdie: hackvr_xdie.o graphics_c3.o graphics_c2.o graphics_cs_x11.o math.o physics.o keyboard.o mouse_die.o keyboard_die.o @@ -46,12 +49,13 @@ hackvr_opengl: hackvr_opengl.o graphics_c3.o graphics_c2_opengl.o graphics_cs_op hackvr_freeglut: override LDLIBS+=-lm -lidc -lGL -lGLU -lglut -lhashtable hackvr_freeglut: hackvr_freeglut.o graphics_c3_freeglut.o math.o physics.o keyboard.o mouse_die.o keyboard_die.o -hackvr_fb.o: CFLAGS+='-DHVR_VERSION="framebuffer"' -hackvr_x11.o: CFLAGS+='-DHVR_VERSION="x11"' -hackvr_xdie.o: CFLAGS+='-DHVR_VERSION="x11+die"' -hackvr_svg.o: CFLAGS+='-DHVR_VERSION="svg"' -hackvr_headless.o: CFLAGS=$(BASE_CFLAGS) -hackvr_headless.o: CFLAGS+='-DHVR_VERSION="headless"' +hackvr_fb.o: override CFLAGS+='-DHVR_VERSION="framebuffer"' +hackvr_x11.o: override CFLAGS+='-DHVR_VERSION="x11"' +hackvr_xdie.o: override CFLAGS+='-DHVR_VERSION="x11+die"' +hackvr_xdiewii.o: override CFLAGS+='-DHVR_VERSION="x11+kdie+wii"' +hackvr_svg.o: override CFLAGS+='-DHVR_VERSION="svg"' +hackvr_headless.o: override CFLAGS=$(BASE_CFLAGS) +hackvr_headless.o: override CFLAGS+='-DHVR_VERSION="headless"' install: all mkdir -p $(PREFIX)/bin @@ -62,6 +66,7 @@ install: all install -t $(PREFIX)/bin hackvr_xdie install -t $(PREFIX)/bin hackvr_fb install -t $(PREFIX)/bin hackvr_svg + install -t $(PREFIX)/bin hackvr_xdiewii # install -t $(PREFIX)/bin hackvr_freeglut uninstall: -- cgit v1.2.3