From 83322f596a9d7a867704efc4c0f720760311cbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Wed, 19 Jan 2011 22:55:18 +0100 Subject: [PATCH] Move Mesh loaders from src/platform to src/lib They are entirely platform-independent. --- CMakeLists.txt | 20 +++++++++---------- Makefile.am | 20 +++++++++---------- src/{platform => lib}/StdMesh.cpp | 0 src/{platform => lib}/StdMesh.h | 0 src/{platform => lib}/StdMeshLoader.h | 0 src/{platform => lib}/StdMeshLoaderBinary.cpp | 0 .../StdMeshLoaderBinaryChunks.cpp | 0 .../StdMeshLoaderBinaryChunks.h | 0 .../StdMeshLoaderDataStream.h | 0 src/{platform => lib}/StdMeshLoaderXml.cpp | 0 src/{platform => lib}/StdMeshMaterial.cpp | 0 src/{platform => lib}/StdMeshMaterial.h | 0 12 files changed, 20 insertions(+), 20 deletions(-) rename src/{platform => lib}/StdMesh.cpp (100%) rename src/{platform => lib}/StdMesh.h (100%) rename src/{platform => lib}/StdMeshLoader.h (100%) rename src/{platform => lib}/StdMeshLoaderBinary.cpp (100%) rename src/{platform => lib}/StdMeshLoaderBinaryChunks.cpp (100%) rename src/{platform => lib}/StdMeshLoaderBinaryChunks.h (100%) rename src/{platform => lib}/StdMeshLoaderDataStream.h (100%) rename src/{platform => lib}/StdMeshLoaderXml.cpp (100%) rename src/{platform => lib}/StdMeshMaterial.cpp (100%) rename src/{platform => lib}/StdMeshMaterial.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 799f4f3c2..2f3bd51ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,6 +374,16 @@ set(OC_CLONK_SOURCES src/lib/StdCompiler.h src/lib/StdMarkup.cpp src/lib/StdMarkup.h + src/lib/StdMesh.cpp + src/lib/StdMesh.h + src/lib/StdMeshLoader.h + src/lib/StdMeshLoaderBinary.cpp + src/lib/StdMeshLoaderBinaryChunks.cpp + src/lib/StdMeshLoaderBinaryChunks.h + src/lib/StdMeshLoaderDataStream.h + src/lib/StdMeshLoaderXml.cpp + src/lib/StdMeshMaterial.cpp + src/lib/StdMeshMaterial.h src/lib/StdResStr2.cpp src/lib/StdResStr2.h src/lib/StdResStr.h @@ -462,16 +472,6 @@ set(OC_CLONK_SOURCES src/platform/StdGL.cpp src/platform/StdGLCtx.cpp src/platform/StdGL.h - src/platform/StdMesh.cpp - src/platform/StdMesh.h - src/platform/StdMeshLoader.h - src/platform/StdMeshLoaderBinary.cpp - src/platform/StdMeshLoaderBinaryChunks.cpp - src/platform/StdMeshLoaderBinaryChunks.h - src/platform/StdMeshLoaderDataStream.h - src/platform/StdMeshLoaderXml.cpp - src/platform/StdMeshMaterial.cpp - src/platform/StdMeshMaterial.h src/platform/StdNoGfx.cpp src/platform/StdNoGfx.h src/platform/StdRegistry.cpp diff --git a/Makefile.am b/Makefile.am index d4c101c3c..dba38ea2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -159,6 +159,16 @@ src/lib/C4Log.cpp \ src/lib/C4Log.h \ src/lib/C4NameList.cpp \ src/lib/C4NameList.h \ +src/lib/StdMesh.cpp \ +src/lib/StdMesh.h \ +src/lib/StdMeshLoader.h \ +src/lib/StdMeshLoaderBinary.cpp \ +src/lib/StdMeshLoaderBinaryChunks.cpp \ +src/lib/StdMeshLoaderBinaryChunks.h \ +src/lib/StdMeshLoaderDataStream.h \ +src/lib/StdMeshLoaderXml.cpp \ +src/lib/StdMeshMaterial.cpp \ +src/lib/StdMeshMaterial.h \ src/lib/texture/C4GraphicsResource.cpp \ src/lib/texture/C4GraphicsResource.h \ src/C4Application.cpp \ @@ -457,16 +467,6 @@ src/platform/StdFont.h \ src/platform/StdGL.cpp \ src/platform/StdGLCtx.cpp \ src/platform/StdGL.h \ -src/platform/StdMesh.cpp \ -src/platform/StdMesh.h \ -src/platform/StdMeshLoader.h \ -src/platform/StdMeshLoaderBinary.cpp \ -src/platform/StdMeshLoaderBinaryChunks.cpp \ -src/platform/StdMeshLoaderBinaryChunks.h \ -src/platform/StdMeshLoaderDataStream.h \ -src/platform/StdMeshLoaderXml.cpp \ -src/platform/StdMeshMaterial.cpp \ -src/platform/StdMeshMaterial.h \ src/platform/StdNoGfx.cpp \ src/platform/StdNoGfx.h \ src/platform/StdRegistry.cpp \ diff --git a/src/platform/StdMesh.cpp b/src/lib/StdMesh.cpp similarity index 100% rename from src/platform/StdMesh.cpp rename to src/lib/StdMesh.cpp diff --git a/src/platform/StdMesh.h b/src/lib/StdMesh.h similarity index 100% rename from src/platform/StdMesh.h rename to src/lib/StdMesh.h diff --git a/src/platform/StdMeshLoader.h b/src/lib/StdMeshLoader.h similarity index 100% rename from src/platform/StdMeshLoader.h rename to src/lib/StdMeshLoader.h diff --git a/src/platform/StdMeshLoaderBinary.cpp b/src/lib/StdMeshLoaderBinary.cpp similarity index 100% rename from src/platform/StdMeshLoaderBinary.cpp rename to src/lib/StdMeshLoaderBinary.cpp diff --git a/src/platform/StdMeshLoaderBinaryChunks.cpp b/src/lib/StdMeshLoaderBinaryChunks.cpp similarity index 100% rename from src/platform/StdMeshLoaderBinaryChunks.cpp rename to src/lib/StdMeshLoaderBinaryChunks.cpp diff --git a/src/platform/StdMeshLoaderBinaryChunks.h b/src/lib/StdMeshLoaderBinaryChunks.h similarity index 100% rename from src/platform/StdMeshLoaderBinaryChunks.h rename to src/lib/StdMeshLoaderBinaryChunks.h diff --git a/src/platform/StdMeshLoaderDataStream.h b/src/lib/StdMeshLoaderDataStream.h similarity index 100% rename from src/platform/StdMeshLoaderDataStream.h rename to src/lib/StdMeshLoaderDataStream.h diff --git a/src/platform/StdMeshLoaderXml.cpp b/src/lib/StdMeshLoaderXml.cpp similarity index 100% rename from src/platform/StdMeshLoaderXml.cpp rename to src/lib/StdMeshLoaderXml.cpp diff --git a/src/platform/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp similarity index 100% rename from src/platform/StdMeshMaterial.cpp rename to src/lib/StdMeshMaterial.cpp diff --git a/src/platform/StdMeshMaterial.h b/src/lib/StdMeshMaterial.h similarity index 100% rename from src/platform/StdMeshMaterial.h rename to src/lib/StdMeshMaterial.h