Move lang.cpp/lang.h to xtool to avoid linking problems

lib/xtool/CMakeLists.txt

@@ -21,6 +21,7 @@ SET(xtool_SRCS
 	xutil/xclock.cpp
 	iniparser/dictionary.c
 	iniparser/iniparser.c
+	lang.cpp
 )
 
 IF(DXSTREAM_DEBUG)

lib/xtool/xtcore.cpp

@@ -1,6 +1,6 @@
 /* ---------------------------- INCLUDE SECTION ----------------------------- */
 
-#include "../../src/lang.h"
+#include "lang.h"
 #include "xglobal.h"
 #include "xt_list.h"
 #include "../xgraph/xgraph.h"

server/CMakeLists.txt

@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(AFTER
 SET(server_SRCS
 	kdsplus.cpp
 	${PROJECT_SOURCE_DIR}/src/xsocket.cpp
-	${PROJECT_SOURCE_DIR}/src/lang.cpp
+	${PROJECT_SOURCE_DIR}/lib/xtool/lang.cpp
 	${PROJECT_SOURCE_DIR}/lib/xgraph/xgraph_dummy.cpp
 	server.cpp
 #win32f.cpp -- candidat to remove

src/CMakeLists.txt

@@ -68,7 +68,6 @@ SET(vangers_SRCS
 	xjoystick.cpp
 	xsocket.cpp
 	zmod_client.cpp
-	lang.cpp
 	${WINDOWS_RES}
         actint/layout.h)
 

src/actint/aci_scr.cpp

@@ -1,7 +1,7 @@
 /* ---------------------------- INCLUDE SECTION ----------------------------- */
 
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 #include "../iscreen/hfont.h"
 
 #include "aci_evnt.h"

src/actint/ascr_fnc.cpp

@@ -1,7 +1,7 @@
 /* ---------------------------- INCLUDE SECTION ----------------------------- */
 
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 #include <zlib.h>
 
 #if defined(__APPLE__) || __GNUC__ < 9

src/iscreen/iscreen.h

@@ -1,7 +1,7 @@
 #ifndef __ISCREEN_H__
 #define __ISCREEN_H__
 
-#include "../lang.h"
+#include "lang.h"
 #include "hfont.h"
 #include "iscreen_options.h"
 #include <vector>

src/iscreen/ivmap.cpp

@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 
 #define LOWLEVEL_OUTPUT
 //#define SAVE_ABILITY

src/sound/sound.cpp

@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 
 #include "hmusic.h"
 #include "hsound.h"

src/units/hobj.cpp

@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 
 #include "../3d/3d_math.h"
 #include "../3d/3dgraph.h"

src/units/items.cpp

@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 
 //#include "..\win32f.h"
 

src/units/mechos.cpp

@@ -1,5 +1,5 @@
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 
 #include "../zmod_client.h"
 

src/uvs/diagen.cpp

@@ -5,7 +5,7 @@
 */
 
 #include "../global.h"
-#include "../lang.h"
+#include "lang.h"
 
 #include "../common.h"
 #include "diagen.h"

surmap/missed.cpp

@@ -23,7 +23,7 @@ typedef unsigned char uchar;
 #include "../src/units/hobj.h"
 #include "../src/units/uvsapi.h"
 #include "../src/units/items.h"
-#include "../src/lang.h"
+#include "lang.h"
 #include "../src/network.h"
 #include "../src/sound/hsound.h"
 #include "../src/xjoystick.h"