Commit ae813919 authored by Thomas Debesse's avatar Thomas Debesse

Merge branch 'heretic2' into 'master'

heretic2: use a dedicated heretic subdirectory for Heretic 2 stuff, and more

See merge request !139
parents 5bacc7d8 12f564a6
......@@ -434,8 +434,8 @@ binaries-qdata3: \
.PHONY: binaries-h2data
binaries-h2data: \
$(INSTALLDIR)/heretic2/h2data.$(EXE) \
$(INSTALLDIR)/heretic2/h2data \
$(INSTALLDIR)/h2data.$(EXE) \
$(INSTALLDIR)/h2data \
.PHONY: binaries-tools-quake3
binaries-tools-quake3: \
......@@ -1018,39 +1018,39 @@ $(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \
contrib/bkgrnd2d/dialog.o \
contrib/bkgrnd2d/plugin.o \
$(INSTALLDIR)/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML)
$(INSTALLDIR)/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/qdata_heretic2/common -Itools/quake2/qdata_heretic2/qcommon -Itools/quake2/qdata_heretic2 -Itools/quake2/common -Ilibs -Iinclude
$(INSTALLDIR)/heretic2/h2data.$(EXE): \
tools/quake2/qdata_heretic2/common/bspfile.o \
tools/quake2/qdata_heretic2/common/cmdlib.o \
tools/quake2/qdata_heretic2/common/inout.o \
tools/quake2/qdata_heretic2/common/l3dslib.o \
tools/quake2/qdata_heretic2/common/lbmlib.o \
tools/quake2/qdata_heretic2/common/mathlib.o \
tools/quake2/qdata_heretic2/common/md4.o \
tools/quake2/qdata_heretic2/common/path_init.o \
tools/quake2/qdata_heretic2/common/qfiles.o \
tools/quake2/qdata_heretic2/common/scriplib.o \
tools/quake2/qdata_heretic2/common/threads.o \
tools/quake2/qdata_heretic2/common/token.o \
tools/quake2/qdata_heretic2/common/trilib.o \
tools/quake2/qdata_heretic2/qcommon/reference.o \
tools/quake2/qdata_heretic2/qcommon/resourcemanager.o \
tools/quake2/qdata_heretic2/qcommon/skeletons.o \
tools/quake2/qdata_heretic2/animcomp.o \
tools/quake2/qdata_heretic2/book.o \
tools/quake2/qdata_heretic2/fmodels.o \
tools/quake2/qdata_heretic2/images.o \
tools/quake2/qdata_heretic2/jointed.o \
tools/quake2/qdata_heretic2/models.o \
tools/quake2/qdata_heretic2/pics.o \
tools/quake2/qdata_heretic2/qdata.o \
tools/quake2/qdata_heretic2/qd_skeletons.o \
tools/quake2/qdata_heretic2/sprites.o \
tools/quake2/qdata_heretic2/svdcmp.o \
tools/quake2/qdata_heretic2/tables.o \
tools/quake2/qdata_heretic2/tmix.o \
tools/quake2/qdata_heretic2/video.o \
$(INSTALLDIR)/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML)
$(INSTALLDIR)/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/heretic2/common -Itools/heretic2/qcommon -Itools/heretic2/h2data -Itools/quake2/common -Ilibs -Iinclude
$(INSTALLDIR)/h2data.$(EXE): \
tools/heretic2/common/bspfile.o \
tools/heretic2/common/cmdlib.o \
tools/heretic2/common/inout.o \
tools/heretic2/common/l3dslib.o \
tools/heretic2/common/lbmlib.o \
tools/heretic2/common/mathlib.o \
tools/heretic2/common/md4.o \
tools/heretic2/common/path_init.o \
tools/heretic2/common/qfiles.o \
tools/heretic2/common/scriplib.o \
tools/heretic2/common/threads.o \
tools/heretic2/common/token.o \
tools/heretic2/common/trilib.o \
tools/heretic2/qcommon/reference.o \
tools/heretic2/qcommon/resourcemanager.o \
tools/heretic2/qcommon/skeletons.o \
tools/heretic2/h2data/animcomp.o \
tools/heretic2/h2data/book.o \
tools/heretic2/h2data/fmodels.o \
tools/heretic2/h2data/images.o \
tools/heretic2/h2data/jointed.o \
tools/heretic2/h2data/models.o \
tools/heretic2/h2data/pics.o \
tools/heretic2/h2data/qdata.o \
tools/heretic2/h2data/qd_skeletons.o \
tools/heretic2/h2data/sprites.o \
tools/heretic2/h2data/svdcmp.o \
tools/heretic2/h2data/tables.o \
tools/heretic2/h2data/tmix.o \
tools/heretic2/h2data/video.o \
libl_net.$(A) \
$(if $(findstring $(OS),Win32),icons/h2data.o,) \
......
......@@ -42,7 +42,7 @@ To fetch default game packages you'll need Git and to fetch some optional ones y
Under MSYS2, the mingw shell must be used.
If you use MSYS2 over SSH, add `mingw64` to the path this way (given you compile for 64 bit windows):
If you use MSYS2 over SSH, add `mingw64` to the path this way (given you compile for 64 bit Windows):
```
export PATH="/mingw64/bin:${PATH}"`
......@@ -126,9 +126,14 @@ targets:
* `radiant` Compiles the radiant core binary
* `modules` Compiles all modules (each module has its own target as well)
* `plugins` Compiles all plugins (each plugin has its own target as well)
* `quake3` Compiles all the Quake3 tools
- `q3map2` Compiles the quake3 map compiler
- `q3data` Compiles the q3data tool
* `tools` Compiles all tools (each tool has its own target as well)
- `quake2` Compiles all the Quake2 tools: `q2map`, `qdata3`
- `heretic2` Compiles all the Heretic2 tools: `q2map`, `h2data`
- `quake3` Compiles all the Quake3 tools:
* `q3map2` Compiles the quake3 map compiler
* `q3data` Compiles the q3data tool
Type `make help` to get an exhaustive list of targets.
### Download details
......
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
add_subdirectory(quake2)
add_subdirectory(quake2/qdata_heretic2)
add_subdirectory(heretic2)
add_subdirectory(quake3)
add_custom_target(tools)
......
include_directories(BEFORE . common qcommon)
include_directories(BEFORE h2data common qcommon)
find_package(OpenGL REQUIRED)
......@@ -6,7 +6,7 @@ find_package(LibXml2 REQUIRED)
include_directories(${LIBXML2_INCLUDE_DIR})
radiant_tool(h2data
h2data.rc
h2data/h2data.rc
common/bspfile.c common/bspfile.h
common/cmdlib.c common/cmdlib.h
......@@ -35,25 +35,25 @@ radiant_tool(h2data
qcommon/resourcemanager.c qcommon/resourcemanager.h
qcommon/skeletons.c qcommon/skeletons.h
adpcm.h
animcomp.c animcomp.h
anorms.h
book.c
fmodels.c qd_fmodel.h
images.c
jointed.c
jointed.h
joints.h
models.c
pics.c
qdata.c qdata.h
qd_skeletons.c qd_skeletons.h
resource.h
sprites.c
svdcmp.c
tables.c
tmix.c
video.c
h2data/adpcm.h
h2data/animcomp.c h2data/animcomp.h
h2data/anorms.h
h2data/book.c
h2data/fmodels.c h2data/qd_fmodel.h
h2data/images.c
h2data/jointed.c
h2data/jointed.h
h2data/joints.h
h2data/models.c
h2data/pics.c
h2data/qdata.c h2data/qdata.h
h2data/qd_skeletons.c h2data/qd_skeletons.h
h2data/resource.h
h2data/sprites.c
h2data/svdcmp.c
h2data/tables.c
h2data/tmix.c
h2data/video.c
)
target_compile_definitions(h2data
......@@ -66,7 +66,7 @@ target_link_libraries(h2data
)
add_custom_target(heretic2)
add_dependencies(heretic2 h2data)
add_dependencies(heretic2 h2data q2map)
if (UNIX)
target_link_libraries(h2data pthread m)
......
......@@ -632,7 +632,7 @@ int main( int argc, char **argv ){
}
else
{
printf("qdata -newskin <base.hrc> <skin.pcx> width height\n");
printf("h2data -newskin <base.hrc> <skin.pcx> width height\n");
}
return 0;
}
......@@ -643,7 +643,7 @@ int main( int argc, char **argv ){
}
else
{
printf( "qdata -genskin <base.hrc> <skin.pcx> <desired width> <desired height>\n" );
printf( "h2data -genskin <base.hrc> <skin.pcx> <desired width> <desired height>\n" );
}
return 0;
......@@ -682,7 +682,7 @@ int main( int argc, char **argv ){
}
if ( i >= argc ) {
Error( "usage: qdata [-archive <directory>]\n"
Error( "usage: h2data [-archive <directory>]\n"
" [-release <directory>]\n"
" [-base <directory>]\n"
" [-compress]\n"
......@@ -701,7 +701,7 @@ int main( int argc, char **argv ){
" [-nomkdir]\n"
" file.qdt\n"
"or\n"
" qdata -genskin <base.hrc> <skin.pcx> <desired width> <desired height>" );
" h2data -genskin <base.hrc> <skin.pcx> <desired width> <desired height>" );
}
if ( do3ds ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment