Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games/glbsp: update the port to version 2.24 + miscellaneous fixes
- Catch up with new improved directory layout: the main code moved into the ``src'' subdirectory; existing makefiles had been fixed and consolidated so each type of target (lib/cmdline/gui) is now handled in the same makefile - Drop PLUGIN option and simply install the header file and static library for consumer ports' convenience - Install more complete set of documentation files while I'm at it
- Loading branch information
Alexey Dokuchaev
authored and
Alexey Dokuchaev
committed
Nov 24, 2022
1 parent
457cf2f
commit c564bf2
Showing
6 changed files
with
74 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
SHA256 (glbsp_src_220.tar.gz) = 0b68b82962aff8c66c4663a5283fa28ef1287beb303dc0c09325e1cecaa8e4d3 | ||
SIZE (glbsp_src_220.tar.gz) = 172283 | ||
TIMESTAMP = 1185432952 | ||
SHA256 (glbsp_src_224.tar.gz) = e3b7c4bce21c2f9b77732a9b5920b6877e884b31dd1ed9273776538dba48a75c | ||
SIZE (glbsp_src_224.tar.gz) = 230977 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
--- Makefile.unx.orig 2007-07-26 03:14:34 UTC | ||
+++ Makefile.unx | ||
@@ -18,13 +18,13 @@ DOC_NAME=glbsp.txt | ||
GUI_NAME=glBSPX | ||
DOC_NAME=glbsp.txt | ||
|
||
-CC=gcc | ||
-CXX=g++ | ||
+CC?=gcc | ||
+CXX?=g++ | ||
AR=ar rc | ||
RANLIB=ranlib | ||
STRIP=strip --strip-unneeded | ||
|
||
-BASE_FLAGS=-Wall -O2 -I./src -DUNIX -DINLINE_G=inline | ||
+BASE_FLAGS=-Wall $(CFLAGS) -I./src -DUNIX -DINLINE_G=inline | ||
|
||
FLTK_DIR=./fltk-1.1.7 | ||
|
||
@@ -34,7 +34,7 @@ MAN_PREFIX=$(INSTALL_PREFIX)/share/man | ||
|
||
# ----- GENERAL STUFF ---------------------------------------------- | ||
|
||
-all: $(LIB_NAME) $(CMD_NAME) $(DOC_NAME) | ||
+all: $(LIB_NAME) $(CMD_NAME) | ||
|
||
clean: | ||
rm -f $(LIB_NAME) $(CMD_NAME) $(GUI_NAME) $(DOC_NAME) | ||
@@ -80,7 +80,6 @@ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS) | ||
|
||
$(CMD_NAME): $(LIB_NAME) $(CMD_OBJS) | ||
$(CC) $(CMD_FLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS) | ||
- $(STRIP) $@ | ||
|
||
install: $(CMD_NAME) | ||
cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/ | ||
@@ -94,14 +93,13 @@ install: $(CMD_NAME) | ||
|
||
# ----- GUI PROGRAM --------------------------------------------- | ||
|
||
-FLTK_FLAGS=-I$(FLTK_DIR) -I$(FLTK_DIR)/zlib | ||
-FLTK_LIBS=-L$(FLTK_DIR)/lib -lfltk_images -lpng -lz -ljpeg \ | ||
- -lfltk -lX11 -lXext | ||
+FLTK_FLAGS=$(shell fltk-config --use-images --cflags) | ||
+FLTK_LIBS=$(shell fltk-config --use-images --ldflags) | ||
|
||
## may need: -L/usr/X11R6/lib | ||
|
||
GUI_FLAGS=$(BASE_FLAGS) $(FLTK_FLAGS) | ||
-GUI_LIBS=$(FLTK_LIBS) -lm | ||
+GUI_LIBS=$(FLTK_LIBS) | ||
|
||
GUI_OBJS=\ | ||
gui/main.o \ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.