adrien/netradiant-custom
1
Fork 0
mirror of https://github.com/Garux/netradiant-custom.git synced 2026-09-28 00:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

better handling of ASSIMP_INTERNAL 4705d56a84

Browse Source
This commit is contained in:
Garux
2025-12-04 04:20:08 +05:00
parent 9fbb551ad6
commit 0456d3d5bb
5 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -90,11 +90,11 @@ ASSIMP_INTERNAL ?= no
CPPFLAGS_ASSIMP ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) assimp --cflags $(STDERR_TO_DEVNULL))
LIBS_ASSIMP ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) assimp --libs-only-L --libs-only-l $(STDERR_TO_DEVNULL))
ifneq ($(ASSIMP_INTERNAL),yes)
CPPFLAGS_ASSIMP := $(CPPFLAGS_ASSIMP)
CPPFLAGS_ASSIMP := $(CPPFLAGS_ASSIMP) -DASSIMP_INCLUDE\(x\)=\<x\>
LIBS_ASSIMP := $(LIBS_ASSIMP)
else
CPPFLAGS_ASSIMP := -Ilibs/assimp/include
LIBS_ASSIMP := -lassimp_
CPPFLAGS_ASSIMP := -Ilibs/assimp/include -DASSIMP_INCLUDE\(x\)=\#x
LIBS_ASSIMP := -lassimp_ -L$(INSTALLDIR)
endif
CPPFLAGS_GL ?=
LIBS_GL ?= -lGL # -lopengl32 on Win32
@@ -542,7 +542,7 @@ ifeq ($(ASSIMP_INTERNAL),yes)
$(INSTALLDIR)/q3map2.$(EXE): LDFLAGS_EXTRA += -Wl,-rpath '-Wl,$$ORIGIN'
endif
endif
$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_ZLIB) $(LIBS_ASSIMP) -L$(INSTALLDIR)
$(INSTALLDIR)/q3map2.$(EXE): LIBS_EXTRA := $(LIBS_XML) $(LIBS_GLIB) $(LIBS_PNG) $(LIBS_JPEG) $(LIBS_ZLIB) $(LIBS_ASSIMP)
$(INSTALLDIR)/q3map2.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) $(CPPFLAGS_GLIB) $(CPPFLAGS_PNG) $(CPPFLAGS_JPEG) -Itools/quake3/common -Ilibs -Iinclude $(CPPFLAGS_ASSIMP)
$(INSTALLDIR)/q3map2.$(EXE): \
tools/quake3/common/cmdlib.o \
@@ -1084,7 +1084,7 @@ ifeq ($(ASSIMP_INTERNAL),yes)
$(INSTALLDIR)/modules/assmodel.$(DLL): LDFLAGS_EXTRA := -Wl,-rpath '-Wl,$$ORIGIN/..'
endif
endif
$(INSTALLDIR)/modules/assmodel.$(DLL): LIBS_EXTRA := $(LIBS_ASSIMP) -L$(INSTALLDIR)
$(INSTALLDIR)/modules/assmodel.$(DLL): LIBS_EXTRA := $(LIBS_ASSIMP)
$(INSTALLDIR)/modules/assmodel.$(DLL): CPPFLAGS_EXTRA := -Ilibs -Iinclude $(CPPFLAGS_ASSIMP) $(CPPFLAGS_QTGUI)
$(INSTALLDIR)/modules/assmodel.$(DLL): \
plugins/assmodel/mdlimage.o \
plugins/assmodel/mdlimage.cpp
+2 -2
View File
@@ -23,8 +23,8 @@
#include "imagelib.h"
#include "assimp/Importer.hpp"
#include "assimp/scene.h"
#include ASSIMP_INCLUDE(assimp/Importer.hpp)
#include ASSIMP_INCLUDE(assimp/scene.h)
Image* LoadMDLImage( Assimp::Importer& importer, ArchiveFile& file ){
plugins/assmodel/model.cpp
+4 -4
View File
@@ -40,10 +40,10 @@
#include "traverselib.h"
#include "render.h"
#include "assimp/Importer.hpp"
#include "assimp/postprocess.h"
#include "assimp/scene.h"
#include "assimp/mesh.h"
#include ASSIMP_INCLUDE(assimp/Importer.hpp)
#include ASSIMP_INCLUDE(assimp/postprocess.h)
#include ASSIMP_INCLUDE(assimp/scene.h)
#include ASSIMP_INCLUDE(assimp/mesh.h)
#include "os/path.h"
#include "stream/stringstream.h"
plugins/assmodel/plugin.cpp
+7 -7
View File
@@ -45,13 +45,13 @@ typedef unsigned char byte;
#include "model.h"
#include "assimp/Importer.hpp"
#include "assimp/importerdesc.h"
#include "assimp/Logger.hpp"
#include "assimp/DefaultLogger.hpp"
#include "assimp/IOSystem.hpp"
#include "assimp/MemoryIOWrapper.h"
#include "assimp/mesh.h"
#include ASSIMP_INCLUDE(assimp/Importer.hpp)
#include ASSIMP_INCLUDE(assimp/importerdesc.h)
#include ASSIMP_INCLUDE(assimp/Logger.hpp)
#include ASSIMP_INCLUDE(assimp/DefaultLogger.hpp)
#include ASSIMP_INCLUDE(assimp/IOSystem.hpp)
#include ASSIMP_INCLUDE(assimp/MemoryIOWrapper.h)
#include ASSIMP_INCLUDE(assimp/mesh.h)
#include "iarchive.h"
#include "idatastream.h"
#include "mdlimage.h"
tools/quake3/q3map2/model.cpp
+9 -9
View File
@@ -34,15 +34,15 @@
#include "model.h"
#include "qspatial.h"
#include "assimp/Importer.hpp"
#include "assimp/importerdesc.h"
#include "assimp/Logger.hpp"
#include "assimp/DefaultLogger.hpp"
#include "assimp/IOSystem.hpp"
#include "assimp/MemoryIOWrapper.h"
#include "assimp/postprocess.h"
#include "assimp/scene.h"
#include "assimp/mesh.h"
#include ASSIMP_INCLUDE(assimp/Importer.hpp)
#include ASSIMP_INCLUDE(assimp/importerdesc.h)
#include ASSIMP_INCLUDE(assimp/Logger.hpp)
#include ASSIMP_INCLUDE(assimp/DefaultLogger.hpp)
#include ASSIMP_INCLUDE(assimp/IOSystem.hpp)
#include ASSIMP_INCLUDE(assimp/MemoryIOWrapper.h)
#include ASSIMP_INCLUDE(assimp/postprocess.h)
#include ASSIMP_INCLUDE(assimp/scene.h)
#include ASSIMP_INCLUDE(assimp/mesh.h)
#include <map>