[openjk] 89/130: SG: Move source code into SP common dir
Simon McVittie
smcv at debian.org
Fri Oct 28 11:09:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit 0e3c1e651a5ae00c0ff06f54119d4c20d49ffbcc
Author: bibendovsky <bibendovsky at hotmail.com>
Date: Thu Sep 1 11:12:52 2016 +0300
SG: Move source code into SP common dir
---
code/CMakeLists.txt | 12 ++++++------
code/game/CMakeLists.txt | 10 +++++-----
{shared => code}/qcommon/ojk_i_saved_game.h | 0
{shared => code}/qcommon/ojk_saved_game.cpp | 0
{shared => code}/qcommon/ojk_saved_game.h | 0
{shared => code}/qcommon/ojk_saved_game_class_archivers.h | 2 +-
{shared => code}/qcommon/ojk_saved_game_helper.h | 0
{shared => code}/qcommon/ojk_saved_game_helper_fwd.h | 0
{shared => code}/qcommon/ojk_scope_guard.h | 0
code/qcommon/q_shared.h | 2 +-
code/rd-vanilla/CMakeLists.txt | 10 +++++-----
codeJK2/cgame/cg_main.cpp | 2 +-
codeJK2/game/CMakeLists.txt | 10 +++++-----
codeJK2/game/G_Timer.cpp | 2 +-
codeJK2/game/Q3_Registers.cpp | 2 +-
codeJK2/game/g_main.cpp | 2 +-
codeJK2/game/g_objectives.cpp | 2 +-
codeJK2/game/g_roff.cpp | 2 +-
codeJK2/game/g_savegame.cpp | 2 +-
codeJK2/icarus/Instance.cpp | 2 +-
codeJK2/icarus/Sequence.cpp | 2 +-
codeJK2/icarus/Sequencer.cpp | 2 +-
codeJK2/icarus/TaskManager.cpp | 2 +-
23 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index b3d3339..34525c4 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -173,12 +173,12 @@ if(BuildSPEngine OR BuildJK2SPEngine)
"${SPDir}/qcommon/timing.h"
"${SPDir}/qcommon/MiniHeap.h"
- "${SharedDir}/qcommon/ojk_i_saved_game.h"
- "${SharedDir}/qcommon/ojk_saved_game.h"
- "${SharedDir}/qcommon/ojk_saved_game.cpp"
- "${SharedDir}/qcommon/ojk_saved_game_helper.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
- "${SharedDir}/qcommon/ojk_scope_guard.h"
+ "${SPDir}/qcommon/ojk_i_saved_game.h"
+ "${SPDir}/qcommon/ojk_saved_game.h"
+ "${SPDir}/qcommon/ojk_saved_game.cpp"
+ "${SPDir}/qcommon/ojk_saved_game_helper.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper_fwd.h"
+ "${SPDir}/qcommon/ojk_scope_guard.h"
${SharedCommonFiles}
)
diff --git a/code/game/CMakeLists.txt b/code/game/CMakeLists.txt
index c86eb42..4c0a81c 100644
--- a/code/game/CMakeLists.txt
+++ b/code/game/CMakeLists.txt
@@ -259,11 +259,11 @@ set(SPGameCommonFiles
"${SPDir}/qcommon/timing.h"
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
- "${SharedDir}/qcommon/ojk_i_saved_game.h"
- "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
- "${SharedDir}/qcommon/ojk_scope_guard.h"
+ "${SPDir}/qcommon/ojk_i_saved_game.h"
+ "${SPDir}/qcommon/ojk_saved_game_class_archivers.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper_fwd.h"
+ "${SPDir}/qcommon/ojk_scope_guard.h"
${SharedCommonFiles}
)
source_group("common" FILES ${SPGameCommonFiles})
diff --git a/shared/qcommon/ojk_i_saved_game.h b/code/qcommon/ojk_i_saved_game.h
similarity index 100%
rename from shared/qcommon/ojk_i_saved_game.h
rename to code/qcommon/ojk_i_saved_game.h
diff --git a/shared/qcommon/ojk_saved_game.cpp b/code/qcommon/ojk_saved_game.cpp
similarity index 100%
rename from shared/qcommon/ojk_saved_game.cpp
rename to code/qcommon/ojk_saved_game.cpp
diff --git a/shared/qcommon/ojk_saved_game.h b/code/qcommon/ojk_saved_game.h
similarity index 100%
rename from shared/qcommon/ojk_saved_game.h
rename to code/qcommon/ojk_saved_game.h
diff --git a/shared/qcommon/ojk_saved_game_class_archivers.h b/code/qcommon/ojk_saved_game_class_archivers.h
similarity index 97%
rename from shared/qcommon/ojk_saved_game_class_archivers.h
rename to code/qcommon/ojk_saved_game_class_archivers.h
index 8f4f8ce..70a5da9 100644
--- a/shared/qcommon/ojk_saved_game_class_archivers.h
+++ b/code/qcommon/ojk_saved_game_class_archivers.h
@@ -7,7 +7,7 @@
#define OJK_SAVED_GAME_CLASS_ARCHIVERS_INCLUDED
-#include "q_math.h"
+#include "qcommon/q_math.h"
#include "ojk_saved_game_helper_fwd.h"
diff --git a/shared/qcommon/ojk_saved_game_helper.h b/code/qcommon/ojk_saved_game_helper.h
similarity index 100%
rename from shared/qcommon/ojk_saved_game_helper.h
rename to code/qcommon/ojk_saved_game_helper.h
diff --git a/shared/qcommon/ojk_saved_game_helper_fwd.h b/code/qcommon/ojk_saved_game_helper_fwd.h
similarity index 100%
rename from shared/qcommon/ojk_saved_game_helper_fwd.h
rename to code/qcommon/ojk_saved_game_helper_fwd.h
diff --git a/shared/qcommon/ojk_scope_guard.h b/code/qcommon/ojk_scope_guard.h
similarity index 100%
rename from shared/qcommon/ojk_scope_guard.h
rename to code/qcommon/ojk_scope_guard.h
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 98e4bdb..20e4aaa 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -161,7 +161,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#endif
#include "qcommon/q_platform.h"
-#include "qcommon/ojk_saved_game_helper_fwd.h"
+#include "ojk_saved_game_helper_fwd.h"
// ================================================================
diff --git a/code/rd-vanilla/CMakeLists.txt b/code/rd-vanilla/CMakeLists.txt
index e25c389..8b90b57 100644
--- a/code/rd-vanilla/CMakeLists.txt
+++ b/code/rd-vanilla/CMakeLists.txt
@@ -77,11 +77,11 @@ if(BuildSPRdVanilla OR BuildJK2SPRdVanilla)
"${SPDir}/qcommon/matcomp.cpp"
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
- "${SharedDir}/qcommon/ojk_i_saved_game.h"
- "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
- "${SharedDir}/qcommon/ojk_scope_guard.h"
+ "${SPDir}/qcommon/ojk_i_saved_game.h"
+ "${SPDir}/qcommon/ojk_saved_game_class_archivers.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper_fwd.h"
+ "${SPDir}/qcommon/ojk_scope_guard.h"
${SharedCommonFiles}
)
source_group("common" FILES ${SPRDVanillaCommonFiles})
diff --git a/codeJK2/cgame/cg_main.cpp b/codeJK2/cgame/cg_main.cpp
index 365c334..128de98 100644
--- a/codeJK2/cgame/cg_main.cpp
+++ b/codeJK2/cgame/cg_main.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../../code/client/vmachine.h"
#include "../../code/qcommon/sstring.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
//NOTENOTE: Be sure to change the mirrored code in g_shared.h
typedef std::map< sstring_t, unsigned char, std::less<sstring_t>, std::allocator< unsigned char > > namePrecache_m;
diff --git a/codeJK2/game/CMakeLists.txt b/codeJK2/game/CMakeLists.txt
index 782071a..3215eea 100644
--- a/codeJK2/game/CMakeLists.txt
+++ b/codeJK2/game/CMakeLists.txt
@@ -231,11 +231,11 @@ set(JK2SPGameCommonFiles
"${SPDir}/qcommon/q_shared.cpp"
"${SPDir}/qcommon/q_shared.h"
"${SPDir}/qcommon/strippublic.h"
- "${SharedDir}/qcommon/ojk_i_saved_game.h"
- "${SharedDir}/qcommon/ojk_saved_game_class_archivers.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper.h"
- "${SharedDir}/qcommon/ojk_saved_game_helper_fwd.h"
- "${SharedDir}/qcommon/ojk_scope_guard.h"
+ "${SPDir}/qcommon/ojk_i_saved_game.h"
+ "${SPDir}/qcommon/ojk_saved_game_class_archivers.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper.h"
+ "${SPDir}/qcommon/ojk_saved_game_helper_fwd.h"
+ "${SPDir}/qcommon/ojk_scope_guard.h"
${SharedCommonFiles}
)
source_group("common" FILES ${JK2SPGameCommonFiles})
diff --git a/codeJK2/game/G_Timer.cpp b/codeJK2/game/G_Timer.cpp
index 9d38ac8..36d6341 100644
--- a/codeJK2/game/G_Timer.cpp
+++ b/codeJK2/game/G_Timer.cpp
@@ -23,7 +23,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_local.h"
#include "../../code/Rufl/hstring.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
#define MAX_GTIMERS 16384
diff --git a/codeJK2/game/Q3_Registers.cpp b/codeJK2/game/Q3_Registers.cpp
index 760632c..c91e73a 100644
--- a/codeJK2/game/Q3_Registers.cpp
+++ b/codeJK2/game/Q3_Registers.cpp
@@ -24,7 +24,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_local.h"
#include "Q3_Registers.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
extern void Q3_DebugPrint( int level, const char *format, ... );
diff --git a/codeJK2/game/g_main.cpp b/codeJK2/game/g_main.cpp
index b34a18d..ef78173 100644
--- a/codeJK2/game/g_main.cpp
+++ b/codeJK2/game/g_main.cpp
@@ -35,7 +35,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "objectives.h"
#include "../cgame/cg_local.h" // yeah I know this is naughty, but we're shipping soon...
#include "time.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
extern CNavigator navigator;
diff --git a/codeJK2/game/g_objectives.cpp b/codeJK2/game/g_objectives.cpp
index 34e258b..c529154 100644
--- a/codeJK2/game/g_objectives.cpp
+++ b/codeJK2/game/g_objectives.cpp
@@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#define G_OBJECTIVES_CPP
#include "objectives.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
qboolean missionInfo_Updated;
diff --git a/codeJK2/game/g_roff.cpp b/codeJK2/game/g_roff.cpp
index 0dc86ec..24fe2ac 100644
--- a/codeJK2/game/g_roff.cpp
+++ b/codeJK2/game/g_roff.cpp
@@ -25,7 +25,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_local.h"
#include "g_roff.h"
#include "g_icarus.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
// The list of precached ROFFs
roff_list_t roffs[MAX_ROFFS];
diff --git a/codeJK2/game/g_savegame.cpp b/codeJK2/game/g_savegame.cpp
index 579abb9..200f4f1 100644
--- a/codeJK2/game/g_savegame.cpp
+++ b/codeJK2/game/g_savegame.cpp
@@ -33,7 +33,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../cgame/cg_camera.h"
#include "g_icarus.h"
#include "../../code/qcommon/sstring.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
extern void OBJ_LoadTacticalInfo(void);
diff --git a/codeJK2/icarus/Instance.cpp b/codeJK2/icarus/Instance.cpp
index a3b4ebe..7f84f77 100644
--- a/codeJK2/icarus/Instance.cpp
+++ b/codeJK2/icarus/Instance.cpp
@@ -29,7 +29,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "instance.h"
#include <assert.h>
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
// Instance
diff --git a/codeJK2/icarus/Sequence.cpp b/codeJK2/icarus/Sequence.cpp
index d3d8da5..5f3a03a 100644
--- a/codeJK2/icarus/Sequence.cpp
+++ b/codeJK2/icarus/Sequence.cpp
@@ -28,7 +28,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "icarus.h"
#include <assert.h>
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
CSequence::CSequence( void )
{
diff --git a/codeJK2/icarus/Sequencer.cpp b/codeJK2/icarus/Sequencer.cpp
index acfb0b3..22edc5a 100644
--- a/codeJK2/icarus/Sequencer.cpp
+++ b/codeJK2/icarus/Sequencer.cpp
@@ -30,7 +30,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "g_shared.h"
#include "assert.h"
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
// Sequencer
diff --git a/codeJK2/icarus/TaskManager.cpp b/codeJK2/icarus/TaskManager.cpp
index 4d1e1c6..83ea256 100644
--- a/codeJK2/icarus/TaskManager.cpp
+++ b/codeJK2/icarus/TaskManager.cpp
@@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include <assert.h>
-#include "qcommon/ojk_saved_game_helper.h"
+#include "../code/qcommon/ojk_saved_game_helper.h"
#define ICARUS_VALIDATE(a) if ( a == false ) return TASK_FAILED;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list