From ec1eb03cc24396ace8a10f14f4cc8a38d69fda83 Mon Sep 17 00:00:00 2001 From: Kp Date: Sat, 4 Oct 2014 17:53:09 +0000 Subject: [PATCH] Move d2x-rebirth/main/segment.cpp -> similar/main/segment.cpp --- SConstruct | 2 +- {d2x-rebirth => similar}/main/segment.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) rename {d2x-rebirth => similar}/main/segment.cpp (98%) diff --git a/SConstruct b/SConstruct index fb28ae44a..4d336b0fb 100644 --- a/SConstruct +++ b/SConstruct @@ -1562,6 +1562,7 @@ class DXXProgram(DXXCommon): 'main/render.cpp', 'main/robot.cpp', 'main/scores.cpp', +'main/segment.cpp', 'main/slew.cpp', 'main/songs.cpp', 'main/state.cpp', @@ -1905,7 +1906,6 @@ class D2XProgram(DXXProgram): 'main/escort.cpp', 'main/gamepal.cpp', 'main/movie.cpp', -'main/segment.cpp', 'misc/physfsrwops.cpp', ] ], diff --git a/d2x-rebirth/main/segment.cpp b/similar/main/segment.cpp similarity index 98% rename from d2x-rebirth/main/segment.cpp rename to similar/main/segment.cpp index 90810924a..53baf49a4 100644 --- a/d2x-rebirth/main/segment.cpp +++ b/similar/main/segment.cpp @@ -15,6 +15,7 @@ #include "segment.h" #include "physfsx.h" +#if defined(DXX_BUILD_DESCENT_II) /* * reads a segment2 structure from a PHYSFS_file */ @@ -80,3 +81,4 @@ void dl_index_write(dl_index *di, PHYSFS_file *fp) PHYSFSX_writeU8(fp, di->count); PHYSFS_writeSLE16(fp, di->index); } +#endif