Skip to content

Commit

Permalink
radiantcore is now buildable with CMake
Browse files Browse the repository at this point in the history 
Added a couple of '#include <climits>' lines to files which were using INT_MAX
without the necessary include (presumably it was included via some other source
in the Automake build).
  • Loading branch information
Matthew Mott committed Dec 3, 2020
1 parent 6b7528e commit bd69224
Show file tree
Hide file tree
Showing 4 changed files with 254 additions and 1 deletion.
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Expand Up @@ -25,9 +25,12 @@ include(${wxWidgets_USE_FILE})
include_directories(libs libs/libfmt include)
add_compile_definitions(POSIX WXINTL_NO_GETTEXT_MACRO)

# Subdirectories
# Supporting libraries
add_subdirectory(libs/math)
add_subdirectory(libs/xmlutil)
add_subdirectory(libs/scene)
add_subdirectory(libs/wxutil)
add_subdirectory(libs/module)

# Main radiant components
add_subdirectory(radiantcore)
248 changes: 248 additions & 0 deletions radiantcore/CMakeLists.txt
View file
@@ -0,0 +1,248 @@
add_library(radiantcore
brush/Brush.cpp
brush/BrushModule.cpp
brush/BrushNode.cpp
brush/csg/CSG.cpp
brush/export/CollisionModel.cpp
brush/Face.cpp
brush/FaceInstance.cpp
brush/FacePlane.cpp
brush/FixedWinding.cpp
brush/TexDef.cpp
brush/TextureMatrix.cpp
brush/TextureProjection.cpp
brush/Winding.cpp
camera/Camera.cpp
camera/CameraManager.cpp
clipper/BrushByPlaneClipper.cpp
clipper/Clipper.cpp
clipper/ClipPoint.cpp
clipper/SplitAlgorithm.cpp
commandsystem/CommandSystem.cpp
eclass/Doom3EntityClass.cpp
eclass/EClassColourManager.cpp
eclass/EClassManager.cpp
entity/AngleKey.cpp
entity/curve/CurveCatmullRom.cpp
entity/curve/Curve.cpp
entity/curve/CurveEditInstance.cpp
entity/curve/CurveNURBS.cpp
entity/Doom3Entity.cpp
entity/doom3group/Doom3Group.cpp
entity/doom3group/Doom3GroupNode.cpp
entity/eclassmodel/EclassModelNode.cpp
entity/EntityModule.cpp
entity/EntityNode.cpp
entity/EntitySettings.cpp
entity/generic/GenericEntity.cpp
entity/generic/GenericEntityNode.cpp
entity/KeyValue.cpp
entity/KeyValueObserver.cpp
entity/light/Light.cpp
entity/light/LightNode.cpp
entity/light/Renderables.cpp
entity/ModelKey.cpp
entity/NameKeyObserver.cpp
entity/NamespaceManager.cpp
entity/RotationKey.cpp
entity/RotationMatrix.cpp
entity/ShaderParms.cpp
entity/speaker/SpeakerNode.cpp
entity/speaker/SpeakerRenderables.cpp
entity/target/TargetableNode.cpp
entity/target/TargetKeyCollection.cpp
entity/target/TargetKey.cpp
entity/target/TargetLineNode.cpp
entity/target/TargetManager.cpp
filetypes/FileTypeRegistry.cpp
filters/BasicFilterSystem.cpp
filters/XMLFilter.cpp
filters/XmlFilterEventAdapter.cpp
fonts/FontLoader.cpp
fonts/FontManager.cpp
fonts/GlyphInfo.cpp
fonts/GlyphSet.cpp
grid/GridManager.cpp
imagefile/BMPLoader.cpp
imagefile/dds.cpp
imagefile/ddslib.cpp
imagefile/ImageLoader.cpp
imagefile/JPEGLoader.cpp
imagefile/PNGLoader.cpp
imagefile/TGALoader.cpp
layers/LayerInfoFileModule.cpp
layers/LayerManager.cpp
layers/LayerModule.cpp
log/COutRedirector.cpp
log/LogFile.cpp
log/LogStreamBuf.cpp
log/LogStream.cpp
log/LogWriter.cpp
log/StringLogDevice.cpp
map/aas/AasFileManager.cpp
map/aas/Doom3AasFile.cpp
map/aas/Doom3AasFileLoader.cpp
map/aas/Doom3AasFileSettings.cpp
map/algorithm/Export.cpp
map/algorithm/Import.cpp
map/algorithm/MapExporter.cpp
map/algorithm/MapImporter.cpp
map/algorithm/Models.cpp
map/algorithm/Skins.cpp
map/CounterManager.cpp
map/EditingStopwatch.cpp
map/EditingStopwatchInfoFileModule.cpp
map/format/Doom3MapFormat.cpp
map/format/Doom3MapReader.cpp
map/format/Doom3MapWriter.cpp
map/format/Doom3PrefabFormat.cpp
map/format/MapFormatManager.cpp
map/format/portable/PortableMapFormat.cpp
map/format/portable/PortableMapReader.cpp
map/format/portable/PortableMapWriter.cpp
map/format/primitiveparsers/BrushDef3.cpp
map/format/primitiveparsers/BrushDef.cpp
map/format/primitiveparsers/Patch.cpp
map/format/primitiveparsers/PatchDef2.cpp
map/format/primitiveparsers/PatchDef3.cpp
map/format/Quake3MapFormat.cpp
map/format/Quake3MapReader.cpp
map/format/Quake4MapFormat.cpp
map/format/Quake4MapReader.cpp
map/infofile/InfoFile.cpp
map/infofile/InfoFileExporter.cpp
map/infofile/InfoFileManager.cpp
map/Map.cpp
map/MapFileManager.cpp
map/MapModules.cpp
map/MapPosition.cpp
map/MapPositionManager.cpp
map/MapPropertyInfoFileModule.cpp
map/MapResource.cpp
map/MapResourceManager.cpp
map/mru/MRU.cpp
map/namespace/ComplexName.cpp
map/namespace/Namespace.cpp
map/namespace/NamespaceFactory.cpp
map/PointFile.cpp
map/RegionManager.cpp
map/RootNode.cpp
model/export/AseExporter.cpp
model/export/Lwo2Chunk.cpp
model/export/Lwo2Exporter.cpp
model/export/ModelExporter.cpp
model/export/ModelScalePreserver.cpp
model/export/PatchSurface.cpp
model/export/ScaledModelExporter.cpp
model/export/WavefrontExporter.cpp
model/md5/MD5AnimationCache.cpp
model/md5/MD5Anim.cpp
model/md5/MD5Model.cpp
model/md5/MD5ModelLoader.cpp
model/md5/MD5ModelNode.cpp
model/md5/MD5Module.cpp
model/md5/MD5Skeleton.cpp
model/md5/MD5Surface.cpp
model/ModelCache.cpp
model/ModelFormatManager.cpp
model/NullModel.cpp
model/NullModelNode.cpp
model/picomodel/PicoModelLoader.cpp
model/picomodel/PicoModelModule.cpp
model/picomodel/StaticModel.cpp
model/picomodel/StaticModelNode.cpp
model/picomodel/StaticModelSurface.cpp
modulesystem/ModuleLoader.cpp
modulesystem/ModuleRegistry.cpp
particles/ParticleDef.cpp
particles/ParticleNode.cpp
particles/ParticleParameter.cpp
particles/ParticlesManager.cpp
particles/RenderableParticleBunch.cpp
particles/RenderableParticle.cpp
particles/RenderableParticleStage.cpp
particles/StageDef.cpp
patch/algorithm/General.cpp
patch/algorithm/Prefab.cpp
patch/Patch.cpp
patch/PatchModule.cpp
patch/PatchNode.cpp
patch/PatchRenderables.cpp
patch/PatchTesselation.cpp
precompiled.cpp
Radiant.cpp
rendersystem/backend/GLProgramFactory.cpp
rendersystem/backend/glprogram/GenericVFPProgram.cpp
rendersystem/backend/glprogram/GLSLBumpProgram.cpp
rendersystem/backend/glprogram/GLSLDepthFillProgram.cpp
rendersystem/backend/OpenGLShader.cpp
rendersystem/backend/OpenGLShaderPass.cpp
rendersystem/debug/SpacePartitionRenderer.cpp
rendersystem/OpenGLRenderSystem.cpp
rendersystem/RenderSystemFactory.cpp
rendersystem/SharedOpenGLContextModule.cpp
scenegraph/Octree.cpp
scenegraph/SceneGraph.cpp
scenegraph/SceneGraphFactory.cpp
selection/algorithm/Curves.cpp
selection/algorithm/Entity.cpp
selection/algorithm/General.cpp
selection/algorithm/Group.cpp
selection/algorithm/GroupCycle.cpp
selection/algorithm/Patch.cpp
selection/algorithm/Planes.cpp
selection/algorithm/Primitives.cpp
selection/algorithm/Shader.cpp
selection/algorithm/Transformation.cpp
selection/clipboard/Clipboard.cpp
selection/group/SelectionGroupInfoFileModule.cpp
selection/group/SelectionGroupManager.cpp
selection/group/SelectionGroupModule.cpp
selection/ManipulationPivot.cpp
selection/manipulators/DragManipulator.cpp
selection/manipulators/ManipulatorBase.cpp
selection/manipulators/ManipulatorComponents.cpp
selection/manipulators/ModelScaleManipulator.cpp
selection/manipulators/RotateManipulator.cpp
selection/manipulators/ScaleManipulator.cpp
selection/manipulators/TranslateManipulator.cpp
selection/RadiantSelectionSystem.cpp
selection/SelectedNodeList.cpp
selection/selectionset/SelectionSet.cpp
selection/selectionset/SelectionSetInfoFileModule.cpp
selection/selectionset/SelectionSetManager.cpp
selection/selectionset/SelectionSetModule.cpp
selection/SelectionTestWalkers.cpp
selection/shaderclipboard/ClosestTexturableFinder.cpp
selection/shaderclipboard/ShaderClipboard.cpp
selection/shaderclipboard/Texturable.cpp
selection/TransformationVisitors.cpp
settings/ColourScheme.cpp
settings/ColourSchemeManager.cpp
settings/Game.cpp
settings/GameManager.cpp
settings/LanguageManager.cpp
settings/PreferencePage.cpp
settings/PreferenceSystem.cpp
shaders/CameraCubeMapDecl.cpp
shaders/CShader.cpp
shaders/Doom3ShaderLayer.cpp
shaders/Doom3ShaderSystem.cpp
shaders/MapExpression.cpp
shaders/ShaderExpression.cpp
shaders/ShaderLibrary.cpp
shaders/ShaderTemplate.cpp
shaders/TableDefinition.cpp
shaders/textures/GLTextureManager.cpp
shaders/textures/TextureManipulator.cpp
skins/Doom3SkinCache.cpp
undo/UndoSystem.cpp
vfs/DeflatedInputStream.cpp
vfs/DirectoryArchive.cpp
vfs/Doom3FileSystem.cpp
vfs/Doom3FileSystemModule.cpp
vfs/ZipArchive.cpp
xmlregistry/RegistryTree.cpp
xmlregistry/XMLRegistry.cpp)
target_compile_options(radiantcore PUBLIC ${SIGC_CFLAGS})
target_include_directories(radiantcore PRIVATE .)
1 change: 1 addition & 0 deletions radiantcore/layers/LayerManager.cpp
View file
Expand Up @@ -15,6 +15,7 @@
#include "LayerInfoFileModule.h"

#include <functional>
#include <climits>

namespace scene
{
Expand Down
1 change: 1 addition & 0 deletions radiantcore/model/export/ScaledModelExporter.cpp
View file
Expand Up @@ -14,6 +14,7 @@
#include <fmt/format.h>
#include "string/case_conv.h"
#include <regex>
#include <climits>

#include "ModelExporter.h"

Expand Down

0 comments on commit bd69224

Please sign in to comment.