scuti/reflex2q3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

Standard cmake build directory, remove Makefile

Browse Source
This commit is contained in:
suhrke 2023-03-25 12:54:35 -07:00
parent 8f916bad20
commit ea7627830c
4 changed files with 7 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,6 +13,7 @@
*.orig *.orig
# executables # executables
build
reflex2q3 reflex2q3
runtests runtests

57
Makefile
View File

@ -1,57 +0,0 @@
EX=reflex2q3
CC=g++
CFLAGS=-static -static-libgcc -static-libstdc++ -I"/mingw64/include/eigen3" -I"include" -I"lib/Catch/single_include/catch2" -I"lib/cxxopts/include" -I"/usr/include/eigen3" -I"/usr/local/include/eigen3"
TESTEX=runtests
all: main test
main: planes.o brushdef.o oopless-parser.o EntityConverter.o
$(CC) $^ src/main.cpp $(CFLAGS) -o $(EX)
test: planes.o brushdef.o oopless-parser.o EntityConverter.o catch.o
$(CC) $^ $(CFLAGS) -o $(TESTEX)
cp runtests .git/hooks/pre-commit
catch.o: test/catch.cpp
$(CC) -c $^ $(CFLAGS)
oopless-parser.o: src/oopless-parser.cpp
$(CC) -c $^ $(CFLAGS)
brushdef.o: src/brushdef.cpp
$(CC) -c $^ $(CFLAGS)
planes.o: src/planes.cpp
$(CC) -c $^ $(CFLAGS)
EntityConverter.o: src/EntityConverter.cpp
$(CC) -c $^ $(CFLAGS)
clean:
rm *.o $(EX)
# From https://github.com/philsquared/Catch
# 64a53355..908c370f Catch1.x -> origin/Catch1.x
# * [new branch] devel -> origin/devel
# * [new branch] devel-refactorings-virtuals -> origin/devel-refactorings-virtuals
# * [new branch] v2.x -> origin/v2.x
# * [new tag] v2.13.10 -> v2.13.10
# * [new tag] v2.13.2 -> v2.13.2
# * [new tag] v2.13.3 -> v2.13.3
# * [new tag] v2.13.4 -> v2.13.4
# * [new tag] v2.13.5 -> v2.13.5
# * [new tag] v2.13.6 -> v2.13.6
# * [new tag] v2.13.7 -> v2.13.7
# * [new tag] v2.13.8 -> v2.13.8
# * [new tag] v2.13.9 -> v2.13.9
# * [new tag] v3.0.0-preview3 -> v3.0.0-preview3
# * [new tag] v3.0.0-preview4 -> v3.0.0-preview4
# * [new tag] v3.0.0-preview5 -> v3.0.0-preview5
# * [new tag] v3.0.1 -> v3.0.1
# * [new tag] v3.1.0 -> v3.1.0
# * [new tag] v3.1.1 -> v3.1.1
# * [new tag] v3.2.0 -> v3.2.0
# * [new tag] v3.2.1 -> v3.2.1
# * [new tag] v3.3.0 -> v3.3.0
# * [new tag] v3.3.1 -> v3.3.1
# * [new tag] v3.3.2 -> v3.3.2

7
README.md
View File

@ -8,7 +8,10 @@ Converts Reflex maps (Version 8 and below) into id Tech map files.
#### Building: #### Building:
```bash ```bash
git submodule update --init --recursive git submodule update --init --recursive
cmake .; make; mkdir build
cd build
cmake ..
make
``` ```
#### Convert map geometry: #### Convert map geometry:
@ -18,7 +21,7 @@ Converts Reflex maps (Version 8 and below) into id Tech map files.
#### Convert map geometry and entities: #### Convert map geometry and entities:
```bash ```bash
./reflex2q3 input.map output.map -e entity-file.rem ./reflex2q3 input.map output.map -e ../entity-file.rem
``` ```
We've provided Quake 3 and Xonotic entity conversion files (r2q3.rem and r2xonotic.rem). To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://notabug.org/scuti/reflex2q3/src/master/docs/doc-entities.txt), our sample .rem files, and relevant documentation for your game. We've provided Quake 3 and Xonotic entity conversion files (r2q3.rem and r2xonotic.rem). To create entity files for other games built on the [id Tech 3](https://en.wikipedia.org/wiki/Id_Tech_3) engine or previous [id Tech](https://en.wikipedia.org/wiki/Id_Tech) engines, refer to our [Reflex entity documentation](https://notabug.org/scuti/reflex2q3/src/master/docs/doc-entities.txt), our sample .rem files, and relevant documentation for your game.

2
test/catch-entityconverter.cpp
View File

@ -21,7 +21,7 @@
#include "EntityConverter.hpp" #include "EntityConverter.hpp"
#define ENTITY_FILENAME "r2xonotic.rem" #define ENTITY_FILENAME "../r2xonotic.rem"
#define DELTA 0.00001 #define DELTA 0.00001