Merge remote-tracking branch 'q4a/linux' into xd_dev

Author: Xottab-DUTY

Externals/cximage/CMakeLists.txt

@@ -40,6 +40,6 @@ include_directories(
 add_library(cximage STATIC ${SOURCES} ${HEADERS})
 
 set_target_properties(cximage PROPERTIES PREFIX "")
-target_link_libraries(cximage)
+target_link_libraries(cximage jpeg)
 set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 

Externals/cximage/ximacfg.h

@@ -4,13 +4,12 @@
 #include <cstddef>
 #endif
 
+#include "Common/Common.hpp"
 extern "C" void*	cxalloc(size_t size);
 extern "C" void		cxfree(void* ptr);
 extern "C" void*	cxrealloc(void* ptr, size_t size);
 
 #ifdef CXIMAGE_AS_SHARED_LIBRARY //must be defined in Release_Shared configuration
-
-#include "Common/Common.hpp"
 // XXX: dirty hack.
 #undef max
 #undef min

Externals/cximage/ximajpg.cpp

@@ -16,7 +16,7 @@
 #undef XMD_H
 
 #include "ximaiter.h"
-         
+#include "ximacfg.h"
 #include <setjmp.h>
 
 struct jpg_error_mgr {

src/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_subdirectory(utils)
 add_subdirectory(Layers)
 add_subdirectory(xr_3da)
-#add_subdirectory(xrMisc)
 add_subdirectory(xrAICore)
 add_subdirectory(xrUICore)
 add_subdirectory(xrCDB)

src/Common/PlatformLinux.inl

@@ -105,13 +105,31 @@ inline void _splitpath (
         strcpy(drive, "");
 
     if(dir) {
-        strcpy(dir, dirname(tmp));
+        char tmp_dir[PATH_MAX] = {0};
+        strcpy(tmp_dir, tmp); // W/A for fname broking
+        strcpy(dir, dirname(tmp_dir)); // This eval modify dirname argument!!!
         if (dir[0] && dir[strlen(dir) - 1] != '/')
             strcat(dir, "/");
     }
 
     if(fname)
+    {
         strcpy(fname, basename(tmp));
+        char *pos = strrchr(fname, '.');
+        if(pos != NULL)
+            *pos = 0;
+    }
+
+    if(ext)
+    {
+        char tmp_ext[NAME_MAX] = { 0 };
+        strcpy(tmp_ext, basename(tmp));
+        char *pos = strrchr(fname, '.');
+        if(pos != NULL)
+            strcpy(ext, pos + 1);
+        else
+            strcpy(ext, "");
+    }
 }
 
 #include <iostream>

src/Layers/xrRender/FSkinned.cpp

@@ -1123,7 +1123,7 @@ BOOL CSkeletonX_ext::_PickBone(IKinematics::pick_result& r, float dist, const Fv
     default: NODEFAULT;
     }
     CHK_DX(V->p_rm_Indices->Unlock());
-#endif	USE_DX10
+#endif // USE_DX10
 
     return result;
 }

src/Layers/xrRenderGL/glSH_Texture.cpp

@@ -7,7 +7,9 @@
 #include "../../xrEngine/Render.h"
 #endif
 
+#ifdef WINDOWS // TODO
 #include "../../xrEngine/tntQAVI.h"
+#endif
 #include "../../xrEngine/xrTheora_Surface.h"
 
 #define		PRIORITY_HIGH	12
@@ -106,6 +108,7 @@ void CTexture::apply_avi(u32 dwStage)
     CHK_GL(glActiveTexture(GL_TEXTURE0 + dwStage));
     CHK_GL(glBindTexture(desc, pSurface));
 
+#ifdef WINDOWS // TODO
     if (pAVI->NeedUpdate())
     {
         // AVI
@@ -114,6 +117,7 @@ void CTexture::apply_avi(u32 dwStage)
         CHK_GL(glTexSubImage2D(desc, 0, 0, 0, m_width, m_height,
             GL_RGBA, GL_UNSIGNED_BYTE, ptr));
     }
+#endif
 };
 
 void CTexture::apply_seq(u32 dwStage)
@@ -212,6 +216,7 @@ void CTexture::Load()
     }
     else if (FS.exist(fn, "$game_textures$", *cName, ".avi"))
     {
+#ifdef WINDOWS // TODO
         // AVI
         pAVI = new CAviPlayerCustom();
 
@@ -244,6 +249,7 @@ void CTexture::Load()
                 pSurface = 0;
             }
         }
+#endif
     }
     else if (FS.exist(fn, "$game_textures$", *cName, ".seq"))
     {

src/Layers/xrRenderPC_GL/CMakeLists.txt

@@ -40,9 +40,10 @@ list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrRen
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrRender/r__pixel_calculator.h")
 
 add_definitions(-DXRLCUTIL_EXPORTS -D_USRDLL -DXRRENDER_GL_EXPORTS -DUSE_OGL -DNO_XR_VDECLARATOR)
+
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore xrCDB xrEngine xrParticles xrScriptEngine xrAPI GLEW luabind ${LUA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} xrCore xrCDB xrEngine xrParticles xrScriptEngine xrAPI GL GLEW luabind ${LUA_LIBRARIES})
 xr_install(${PROJECT_NAME})
 

src/Layers/xrRenderPC_GL/gl_R_render.cpp

@@ -471,7 +471,7 @@ void CRender::Render()
         Target->mark_msaa_edges();
     }
 
-    //	TODO: DX10: Implement DX10 rain.
+#ifdef WINDOWS//	TODO: DX10: Implement DX10 rain.
     if (ps_r2_ls_flags.test(R3FLAG_DYN_WET_SURF))
     {
         PIX_EVENT(DEFER_RAIN);
@@ -493,6 +493,7 @@ void CRender::Render()
         }
         Target->accum_direct_blend();
     }
+#endif
 
     {
         PIX_EVENT(DEFER_SELF_ILLUM);

src/xrCore/CMakeLists.txt

@@ -39,13 +39,13 @@ execute_process(COMMAND git rev-parse --abbrev-ref HEAD
 
 message( "branch: " ${GIT_BRANCH} )
 
-add_definitions(-DXRCORE_EXPORTS -DGIT_INFO_CURRENT_COMMIT="${GIT_SHA1}" -DGIT_INFO_CURRENT_BRANCH="${GIT_BRANCH}")
+add_definitions(-DXRCORE_EXPORTS -DGIT_INFO_CURRENT_COMMIT=${GIT_SHA1} -DGIT_INFO_CURRENT_BRANCH=${GIT_BRANCH})
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")
 cotire(${PROJECT_NAME})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 
-target_link_libraries(${PROJECT_NAME} xrMiscMath ${SDL_LIBRARIES} ${LZO_LIBRARIES} ${CRYPTO++_LIBRARIES} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} xrMiscMath dl pthread ${SDL_LIBRARIES} ${LZO_LIBRARIES} ${CRYPTO++_LIBRARIES} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})
 xr_install(${PROJECT_NAME})