WINTERMUTE: Move non OpenGL code out of OpenGL folder

aquadran · Aug 28, 2020 · c28a200 · c28a200
1 parent 55c6a3a
commit c28a200
Show file tree

Hide file tree

Showing 42 changed files with 55 additions and 55 deletions.
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -45,8 +45,8 @@
 #include "engines/wintermute/base/base_region.h"
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/base/particles/part_emitter.h"
 #include "engines/wintermute/base/scriptables/script.h"

diff --git a/engines/wintermute/ad/ad_attach_3dx.cpp b/engines/wintermute/ad/ad_attach_3dx.cpp
@@ -29,8 +29,8 @@
 #include "engines/wintermute/ad/ad_attach_3dx.h"
 #include "engines/wintermute/base/base_active_rect.h"
 #include "engines/wintermute/base/base_game.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/base/scriptables/script.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"

diff --git a/engines/wintermute/ad/ad_block.cpp b/engines/wintermute/ad/ad_block.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/ad/ad_block.h"
 #include "engines/wintermute/base/base_persistence_manager.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/ad/ad_generic.cpp b/engines/wintermute/ad/ad_generic.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/ad/ad_generic.h"
 #include "engines/wintermute/base/base_persistence_manager.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/ad/ad_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
@@ -31,8 +31,8 @@
 #include "engines/wintermute/ad/ad_scene.h"
 #include "engines/wintermute/ad/ad_scene_geometry.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/base/scriptables/script_stack.h"
 #include "engines/wintermute/base/scriptables/script_value.h"

diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
@@ -65,7 +65,7 @@
 #include "engines/wintermute/ad/ad_actor_3dx.h"
 #include "engines/wintermute/ad/ad_scene_geometry.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/light3d.h"
+#include "engines/wintermute/base/gfx/3ds/light3d.h"
 #endif
 
 namespace Wintermute {

diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -44,10 +44,10 @@
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/file/base_file.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/camera3d.h"
-#include "engines/wintermute/base/gfx/opengl/light3d.h"
-#include "engines/wintermute/base/gfx/opengl/loader3ds.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/camera3d.h"
+#include "engines/wintermute/base/gfx/3ds/light3d.h"
+#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 #include "engines/wintermute/math/math_util.h"
 #include "engines/wintermute/system/sys_class_registry.h"
 #include "engines/wintermute/wintermute.h"

diff --git a/engines/wintermute/ad/ad_walkplane.cpp b/engines/wintermute/ad/ad_walkplane.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/ad/ad_walkplane.h"
 #include "engines/wintermute/base/base_persistence_manager.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/ad/ad_waypoint_group3d.cpp b/engines/wintermute/ad/ad_waypoint_group3d.cpp
@@ -28,7 +28,7 @@
 
 #include "common/util.h"
 #include "engines/wintermute/ad/ad_waypoint_group3d.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
@@ -37,7 +37,7 @@
 #include "engines/wintermute/base/font/base_font_storage.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #ifdef ENABLE_WME3D
-#include "engines/wintermute/base/gfx/opengl/base_renderer3d.h"
+#include "engines/wintermute/base/gfx/base_renderer3d.h"
 #endif
 #include "engines/wintermute/base/base_keyboard_state.h"
 #include "engines/wintermute/base/base_parser.h"

diff --git a/...s/wintermute/base/gfx/opengl/camera3d.cpp → engines/wintermute/base/gfx/3ds/camera3d.cpp b/...s/wintermute/base/gfx/opengl/camera3d.cpp → engines/wintermute/base/gfx/3ds/camera3d.cpp
@@ -26,8 +26,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "engines/wintermute/base/gfx/opengl/camera3d.h"
-#include "engines/wintermute/base/gfx/opengl/loader3ds.h"
+#include "engines/wintermute/base/gfx/3ds/camera3d.h"
+#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
 #include "engines/wintermute/math/math_util.h"
 #include "math/angle.h"
 #include "math/glmath.h"

diff --git a/...nes/wintermute/base/gfx/opengl/camera3d.h → engines/wintermute/base/gfx/3ds/camera3d.h b/...nes/wintermute/base/gfx/opengl/camera3d.h → engines/wintermute/base/gfx/3ds/camera3d.h
diff --git a/...es/wintermute/base/gfx/opengl/light3d.cpp → engines/wintermute/base/gfx/3ds/light3d.cpp b/...es/wintermute/base/gfx/opengl/light3d.cpp → engines/wintermute/base/gfx/3ds/light3d.cpp
@@ -28,8 +28,8 @@
 
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/light3d.h"
-#include "engines/wintermute/base/gfx/opengl/loader3ds.h"
+#include "engines/wintermute/base/gfx/3ds/light3d.h"
+#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
 #include "engines/wintermute/math/math_util.h"
 #include "engines/wintermute/wintypes.h"
 #include "graphics/opengl/system_headers.h"

diff --git a/engines/wintermute/base/gfx/opengl/light3d.h → engines/wintermute/base/gfx/3ds/light3d.h b/engines/wintermute/base/gfx/opengl/light3d.h → engines/wintermute/base/gfx/3ds/light3d.h
diff --git a/.../wintermute/base/gfx/opengl/loader3ds.cpp → ...nes/wintermute/base/gfx/3ds/loader3ds.cpp b/.../wintermute/base/gfx/opengl/loader3ds.cpp → ...nes/wintermute/base/gfx/3ds/loader3ds.cpp
@@ -23,11 +23,11 @@
 #include "common/memstream.h"
 #include "engines/wintermute/base/base_file_manager.h"
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/opengl/base_renderer3d.h"
-#include "engines/wintermute/base/gfx/opengl/camera3d.h"
-#include "engines/wintermute/base/gfx/opengl/light3d.h"
-#include "engines/wintermute/base/gfx/opengl/loader3ds.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/base_renderer3d.h"
+#include "engines/wintermute/base/gfx/3ds/camera3d.h"
+#include "engines/wintermute/base/gfx/3ds/light3d.h"
+#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/...es/wintermute/base/gfx/opengl/loader3ds.h → engines/wintermute/base/gfx/3ds/loader3ds.h b/...es/wintermute/base/gfx/opengl/loader3ds.h → engines/wintermute/base/gfx/3ds/loader3ds.h
diff --git a/...es/wintermute/base/gfx/opengl/mesh3ds.cpp → engines/wintermute/base/gfx/3ds/mesh3ds.cpp b/...es/wintermute/base/gfx/opengl/mesh3ds.cpp → engines/wintermute/base/gfx/3ds/mesh3ds.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "common/file.h"
-#include "engines/wintermute/base/gfx/opengl/loader3ds.h"
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds.h → engines/wintermute/base/gfx/3ds/mesh3ds.h b/engines/wintermute/base/gfx/opengl/mesh3ds.h → engines/wintermute/base/gfx/3ds/mesh3ds.h
diff --git a/...rmute/base/gfx/opengl/base_renderer3d.cpp → ...s/wintermute/base/gfx/base_renderer3d.cpp b/...rmute/base/gfx/opengl/base_renderer3d.cpp → ...s/wintermute/base/gfx/base_renderer3d.cpp
@@ -20,7 +20,7 @@
  *
  */
 
-#include "engines/wintermute/base/gfx/opengl/base_renderer3d.h"
+#include "engines/wintermute/base/gfx/base_renderer3d.h"
 #include "math/glmath.h"
 
 namespace Wintermute {

diff --git a/...termute/base/gfx/opengl/base_renderer3d.h → ...nes/wintermute/base/gfx/base_renderer3d.h b/...termute/base/gfx/opengl/base_renderer3d.h → ...nes/wintermute/base/gfx/base_renderer3d.h
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -26,10 +26,10 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
 #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/camera3d.h"
-#include "engines/wintermute/base/gfx/opengl/light3d.h"
 #include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h"
 #include "engines/wintermute/base/gfx/opengl/meshx_opengl.h"
+#include "engines/wintermute/base/gfx/3ds/camera3d.h"
+#include "engines/wintermute/base/gfx/3ds/light3d.h"
 #include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h"
 #include "graphics/opengl/system_headers.h"
 #include "math/glmath.h"

diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -23,7 +23,7 @@
 #ifndef WINTERMUTE_BASE_RENDER_OPENGL3D_H
 #define WINTERMUTE_BASE_RENDER_OPENGL3D_H
 
-#include "engines/wintermute/base/gfx/opengl/base_renderer3d.h"
+#include "engines/wintermute/base/gfx/base_renderer3d.h"
 #include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/math/vector2.h"
 #include "engines/wintermute/dctypes.h"

diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -26,10 +26,10 @@
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h"
 #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/camera3d.h"
 #include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h"
 #include "engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h"
 #include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h"
+#include "engines/wintermute/base/gfx/3ds/camera3d.h"
 #include "graphics/opengl/system_headers.h"
 #include "math/glmath.h"
 

diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -23,7 +23,7 @@
 #ifndef WINTERMUTE_BASE_RENDER_OPENGL3D_H
 #define WINTERMUTE_BASE_RENDER_OPENGL3D_H
 
-#include "engines/wintermute/base/gfx/opengl/base_renderer3d.h"
+#include "engines/wintermute/base/gfx/base_renderer3d.h"
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/math/vector2.h"

diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
@@ -23,7 +23,7 @@
 #ifndef WINTERMUTE_MESH_OPENGL_H
 #define WINTERMUTE_MESH_OPENGL_H
 
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
@@ -23,7 +23,7 @@
 #ifndef WINTERMUTE_MESH_OPENGL_H
 #define WINTERMUTE_MESH_OPENGL_H
 
-#include "engines/wintermute/base/gfx/opengl/mesh3ds.h"
+#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
 #include "graphics/opengl/shader.h"
 
 namespace Wintermute {

diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/material.h"
 #include "engines/wintermute/base/gfx/opengl/meshx_opengl.h"
+#include "engines/wintermute/base/gfx/x/material.h"
 #include "graphics/opengl/system_headers.h"
 
 namespace Wintermute {

diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.h b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_MESH_X_OPENGL_H
 #define WINTERMUTE_MESH_X_OPENGL_H
 
-#include "engines/wintermute/base/gfx/opengl/meshx.h"
+#include "engines/wintermute/base/gfx/x/meshx.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/material.h"
 #include "engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h"
+#include "engines/wintermute/base/gfx/x/material.h"
 #include "graphics/opengl/system_headers.h"
 
 namespace Wintermute {

diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_MESH_X_OPENGL_SHADER_H
 #define WINTERMUTE_MESH_X_OPENGL_SHADER_H
 
-#include "engines/wintermute/base/gfx/opengl/meshx.h"
+#include "engines/wintermute/base/gfx/x/meshx.h"
 #include "graphics/opengl/shader.h"
 
 namespace Wintermute {

diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SHADOW_VOLUME_OPENGL_H
 #define WINTERMUTE_SHADOW_VOLUME_OPENGL_H
 
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
 
 namespace Wintermute {
 

diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
@@ -29,7 +29,7 @@
 #ifndef WINTERMUTE_SHADOW_VOLUME_OPENGL_SHADER_H
 #define WINTERMUTE_SHADOW_VOLUME_OPENGL_SHADER_H
 
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
 #include "graphics/opengl/shader.h"
 #include "graphics/opengl/system_headers.h"
 

diff --git a/...termute/base/gfx/opengl/shadow_volume.cpp → ...nes/wintermute/base/gfx/shadow_volume.cpp b/...termute/base/gfx/opengl/shadow_volume.cpp → ...nes/wintermute/base/gfx/shadow_volume.cpp
@@ -28,7 +28,7 @@
 
 #include "engines/wintermute/base/base_game.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
 #include "engines/wintermute/dcgf.h"
 #include "graphics/opengl/system_headers.h"
 

diff --git a/...intermute/base/gfx/opengl/shadow_volume.h → engines/wintermute/base/gfx/shadow_volume.h b/...intermute/base/gfx/opengl/shadow_volume.h → engines/wintermute/base/gfx/shadow_volume.h
diff --git a/engines/wintermute/base/gfx/x/frame_node.cpp b/engines/wintermute/base/gfx/x/frame_node.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "engines/wintermute/base/base_game.h"
-#include "engines/wintermute/base/gfx/opengl/base_renderer3d.h"
-#include "engines/wintermute/base/gfx/opengl/material.h"
+#include "engines/wintermute/base/gfx/base_renderer3d.h"
+#include "engines/wintermute/base/gfx/x/material.h"
 #include "engines/wintermute/base/gfx/x/frame_node.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/base/gfx/x/loader_x.h"

diff --git a/engines/wintermute/base/gfx/x/frame_node.h b/engines/wintermute/base/gfx/x/frame_node.h
@@ -30,7 +30,7 @@
 #define WINTERMUTE_FRAME_NODE_H
 
 #include "engines/wintermute/base/base_named_object.h"
-#include "engines/wintermute/base/gfx/opengl/meshx.h"
+#include "engines/wintermute/base/gfx/x/meshx.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/coll_templ.h"
 #include "math/matrix4.h"

diff --git a/...s/wintermute/base/gfx/opengl/material.cpp → engines/wintermute/base/gfx/x/material.cpp b/...s/wintermute/base/gfx/opengl/material.cpp → engines/wintermute/base/gfx/x/material.cpp
@@ -30,7 +30,7 @@
 #include "engines/wintermute/base/base_sprite.h"
 #include "engines/wintermute/base/base_surface_storage.h"
 #include "engines/wintermute/base/gfx/base_surface.h"
-#include "engines/wintermute/base/gfx/opengl/material.h"
+#include "engines/wintermute/base/gfx/x/material.h"
 #include "engines/wintermute/base/gfx/x/loader_x.h"
 #include "engines/wintermute/dcgf.h"
 #include "engines/wintermute/utils/path_util.h"

diff --git a/...nes/wintermute/base/gfx/opengl/material.h → engines/wintermute/base/gfx/x/material.h b/...nes/wintermute/base/gfx/opengl/material.h → engines/wintermute/base/gfx/x/material.h
diff --git a/engines/wintermute/base/gfx/opengl/meshx.cpp → engines/wintermute/base/gfx/x/meshx.cpp b/engines/wintermute/base/gfx/opengl/meshx.cpp → engines/wintermute/base/gfx/x/meshx.cpp
@@ -26,9 +26,9 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#include "engines/wintermute/base/gfx/opengl/material.h"
-#include "engines/wintermute/base/gfx/opengl/meshx.h"
-#include "engines/wintermute/base/gfx/opengl/shadow_volume.h"
+#include "engines/wintermute/base/gfx/shadow_volume.h"
+#include "engines/wintermute/base/gfx/x/material.h"
+#include "engines/wintermute/base/gfx/x/meshx.h"
 #include "engines/wintermute/base/gfx/x/frame_node.h"
 #include "engines/wintermute/base/gfx/x/loader_x.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"

diff --git a/engines/wintermute/base/gfx/opengl/meshx.h → engines/wintermute/base/gfx/x/meshx.h b/engines/wintermute/base/gfx/opengl/meshx.h → engines/wintermute/base/gfx/x/meshx.h
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/x/modelx.cpp
@@ -31,11 +31,11 @@
 #include "engines/wintermute/base/base_parser.h"
 #include "engines/wintermute/base/gfx/base_renderer.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
-#include "engines/wintermute/base/gfx/opengl/material.h"
 #include "engines/wintermute/base/gfx/x/active_animation.h"
 #include "engines/wintermute/base/gfx/x/animation_channel.h"
 #include "engines/wintermute/base/gfx/x/animation_set.h"
 #include "engines/wintermute/base/gfx/x/frame_node.h"
+#include "engines/wintermute/base/gfx/x/material.h"
 #include "engines/wintermute/base/gfx/x/modelx.h"
 #include "engines/wintermute/base/gfx/x/loader_x.h"
 #include "engines/wintermute/dcgf.h"

diff --git a/engines/wintermute/module.mk b/engines/wintermute/module.mk
@@ -65,37 +65,37 @@ MODULE_OBJS := \
 	base/font/base_font_storage.o \
 	base/gfx/base_image.o \
 	base/gfx/base_renderer.o \
+	base/gfx/base_renderer3d.o \
 	base/gfx/base_surface.o \
+	base/gfx/shadow_volume.o \
 	base/gfx/osystem/base_surface_osystem.o \
 	base/gfx/osystem/base_render_osystem.o \
 	base/gfx/osystem/render_ticket.o \
-	base/gfx/opengl/base_renderer3d.o \
 	base/gfx/opengl/base_surface_opengl_texture.o \
 	base/gfx/opengl/base_render_opengl_texture.o \
 	base/gfx/opengl/base_surface_opengl3d.o \
 	base/gfx/opengl/base_render_opengl3d.o \
 	base/gfx/opengl/base_render_opengl3d_shader.o \
 	base/gfx/opengl/render_ticket.o \
-	base/gfx/opengl/light3d.o \
-	base/gfx/opengl/camera3d.o \
-	base/gfx/opengl/material.o \
-	base/gfx/opengl/meshx.o \
 	base/gfx/opengl/meshx_opengl.o \
 	base/gfx/opengl/meshx_opengl_shader.o \
-	base/gfx/opengl/mesh3ds.o \
 	base/gfx/opengl/mesh3ds_opengl.o \
 	base/gfx/opengl/mesh3ds_opengl_shader.o \
-	base/gfx/opengl/loader3ds.o \
-	base/gfx/opengl/shadow_volume.o \
 	base/gfx/opengl/shadow_volume_opengl.o \
 	base/gfx/opengl/shadow_volume_opengl_shader.o \
 	base/gfx/x/active_animation.o \
 	base/gfx/x/animation.o \
 	base/gfx/x/animation_channel.o \
 	base/gfx/x/animation_set.o \
 	base/gfx/x/frame_node.o \
+	base/gfx/x/material.o \
+	base/gfx/x/meshx.o \
 	base/gfx/x/modelx.o \
 	base/gfx/x/loader_x.o \
+	base/gfx/3ds/camera3d.o \
+	base/gfx/3ds/light3d.o \
+	base/gfx/3ds/loader3ds.o \
+	base/gfx/3ds/mesh3ds.o \
 	base/particles/part_particle.o \
 	base/particles/part_emitter.o \
 	base/particles/part_force.o \