xrRenderPC_GL: now can build (not linking) on linux

eagleivg · q4a · commit 580e0dcda6cb · 2018-09-29T20:30:08.000+03:00
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -931,5 +931,14 @@ typedef struct _D3DRECT {
 
 typedef DWORD           FOURCC;
 
+typedef struct _AVIINDEXENTRY {
+    DWORD	ckid;
+    DWORD	dwFlags;
+    DWORD	dwChunkOffset;
+    DWORD	dwChunkLength;
+} AVIINDEXENTRY;
+
+typedef void *HIC;
+
 inline BOOL SwitchToThread() { return (0 == pthread_yield()); }
 
diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp
@@ -252,9 +252,9 @@ class CCC_detail_radius : public CCC_Integer
         apply();
     }
 
-    void Status(TStatus& S) override
+    void getStatus(TStatus& S) override
     {
-        CCC_Integer::Status(S);
+        CCC_Integer::getStatus(S);
     }
 };
 
@@ -285,9 +285,9 @@ class CCC_tf_Aniso : public CCC_Integer
         CCC_Integer::Execute(args);
         apply();
     }
-    virtual void Status(TStatus& S)
+    virtual void getStatus(TStatus& S)
     {
-        CCC_Integer::Status(S);
+        CCC_Integer::getStatus(S);
         apply();
     }
 };
@@ -315,9 +315,9 @@ class CCC_tf_MipBias : public CCC_Float
         CCC_Float::Execute(args);
         apply();
     }
-    virtual void Status(TStatus& S)
+    virtual void getStatus(TStatus& S)
     {
-        CCC_Float::Status(S);
+        CCC_Float::getStatus(S);
         apply();
     }
 };
@@ -639,7 +639,7 @@ class CCC_Dof : public CCC_Vector3
                 g_pGamePersistent->SetBaseDof(ps_r2_dof);
         }
     }
-    virtual void Status(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); }
+    virtual void getStatus(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); }
     virtual void Info(TInfo& I)
     {
         xr_sprintf(I, "vector3 in range [%f,%f,%f]-[%f,%f,%f]", min.x, min.y, min.z, max.x, max.y, max.z);
diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt
@@ -39,4 +39,4 @@ add_definitions(-DXRLCUTIL_EXPORTS -D_USRDLL -DXRRENDER_GL_EXPORTS -DUSE_OGL -DN
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore luabind LuaJIT xrCDB xrEngine xrParticles xrScriptEngine xrAPI)
+target_link_libraries(${PROJECT_NAME} xrCore luabind luajit xrCDB xrEngine xrParticles xrScriptEngine xrAPI)
diff --git a/src/xrEngine/XR_IOConsole.cpp b/src/xrEngine/XR_IOConsole.cpp
@@ -446,14 +446,14 @@ void CConsole::DrawBackgrounds(bool bGame)
                 continue;
             }
 
-			r2.set_zero();
+            r2.set_zero();
             tmp.assign(ts.text.c_str(), ts.HL_start);
-			r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
-			r2.y1 = pr.y1 + i * font_h;
+            r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
+            r2.y1 = pr.y1 + i * font_h;
 
             tmp.assign(ts.text.c_str(), ts.HL_finish);
-			r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
-			r2.y2 = r2.y1 + font_h;
+            r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());
+            r2.y2 = r2.y1 + font_h;
 
             DrawRect(r2, tips_word_color);
 
@@ -564,7 +564,7 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd)
                 else
                 {
                     IConsole_Command::TStatus stat;
-                    cc->Status(stat);
+                    cc->getStatus(stat);
                     Msg("- %s %s", cc->Name(), stat);
                 }
             }
diff --git a/src/xrEngine/XR_IOConsole_get.cpp b/src/xrEngine/XR_IOConsole_get.cpp
@@ -78,7 +78,7 @@ LPCSTR CConsole::GetString(LPCSTR cmd) const
         return NULL;
 
     static IConsole_Command::TStatus stat;
-    cc->Status(stat);
+    cc->getStatus(stat);
     return stat;
 }
 
diff --git a/src/xrEngine/tntQAVI.h b/src/xrEngine/tntQAVI.h
@@ -6,6 +6,8 @@
 #if defined(WINDOWS)
 #include "vfw.h"
 #include "mmsystem.h"
+#elif defined(LINUX)
+#include <FreeImage.h>
 #endif
 
 // replaced with standard AVIIF_KEYFRAME
diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp
@@ -156,7 +156,7 @@ class CCC_Help : public IConsole_Command
         {
             IConsole_Command& C = *(it->second);
             TStatus _S;
-            C.Status(_S);
+            C.getStatus(_S);
             TInfo _I;
             C.Info(_I);
 
@@ -601,7 +601,7 @@ class CCC_soundDevice : public CCC_Token
         GetToken();
         if (!tokens)
             return;
-        inherited::Status(S);
+        inherited::getStatus(S);
     }
 
     const xr_token* GetToken() noexcept override
diff --git a/src/xrEngine/xr_ioc_cmd.h b/src/xrEngine/xr_ioc_cmd.h
@@ -69,12 +69,12 @@ class ENGINE_API IConsole_Command
     LPCSTR Name() { return cName; }
     void InvalidSyntax();
     virtual void Execute(LPCSTR args) = 0;
-    virtual void Status(TStatus& S) { S[0] = 0; }
+    virtual void getStatus(TStatus& S) { S[0] = 0; }
     virtual void Info(TInfo& I) { xr_strcpy(I, "(no arguments)"); }
     virtual void Save(IWriter* F)
     {
         TStatus S;
-        Status(S);
+        getStatus(S);
         if (S[0])
             F->w_printf("%s %s\r\n", cName, S);
     }
@@ -110,7 +110,7 @@ class ENGINE_API CCC_Mask : public IConsole_Command
         else
             InvalidSyntax();
     }
-    virtual void Status(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
+    virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
     virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); }
     virtual void fill_tips(vecTips& tips, u32 /*mode*/)
     {
@@ -136,7 +136,7 @@ class ENGINE_API CCC_ToggleMask : public IConsole_Command
         strconcat(sizeof(S), S, cName, " is ", value->test(mask) ? "on" : "off");
         Log(S);
     }
-    virtual void Status(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
+    virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }
     virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); }
     virtual void fill_tips(vecTips& tips, u32 /*mode*/)
     {
@@ -175,7 +175,7 @@ class ENGINE_API CCC_Token : public IConsole_Command
         if (!tok->name)
             InvalidSyntax();
     }
-    virtual void Status(TStatus& S)
+    virtual void getStatus(TStatus& S)
     {
         const xr_token* tok = GetToken();
         while (tok->name)
@@ -255,7 +255,7 @@ class ENGINE_API CCC_Float : public IConsole_Command
         else
             *value = v;
     }
-    virtual void Status(TStatus& S)
+    virtual void getStatus(TStatus& S)
     {
         xr_sprintf(S, sizeof(S), "%3.5f", *value);
         while (xr_strlen(S) && ('0' == S[xr_strlen(S) - 1]))
@@ -305,7 +305,7 @@ class ENGINE_API CCC_Vector3 : public IConsole_Command
         }
         value->set(v);
     }
-    virtual void Status(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); }
+    virtual void getStatus(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); }
     virtual void Info(TInfo& I)
     {
         xr_sprintf(I, sizeof(I), "vector3 in range [%e,%e,%e]-[%e,%e,%e]", min.x, min.y, min.z, max.x, max.y, max.z);
@@ -344,7 +344,7 @@ class ENGINE_API CCC_Integer : public IConsole_Command
         else
             *value = v;
     }
-    virtual void Status(TStatus& S) { xr_itoa(*value, S, 10); }
+    virtual void getStatus(TStatus& S) { xr_itoa(*value, S, 10); }
     virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "integer value in range [%d,%d]", min, max); }
     virtual void fill_tips(vecTips& tips, u32 mode)
     {
@@ -370,7 +370,7 @@ class ENGINE_API CCC_String : public IConsole_Command
     };
 
     virtual void Execute(LPCSTR args) { strncpy_s(value, size, args, size - 1); }
-    virtual void Status(TStatus& S) { xr_strcpy(S, value); }
+    virtual void getStatus(TStatus& S) { xr_strcpy(S, value); }
     virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "string with up to %d characters", size); }
     virtual void fill_tips(vecTips& tips, u32 mode)
     {

Original file line number	Diff line number	Diff line change
`@@ -252,9 +252,9 @@ class CCC_detail_radius : public CCC_Integer`
`252`	`252`	`apply();`
`253`	`253`	`}`
`254`	`254`
`255`		`- void Status(TStatus& S) override`
	`255`	`+ void getStatus(TStatus& S) override`
`256`	`256`	`{`
`257`		`- CCC_Integer::Status(S);`
	`257`	`+ CCC_Integer::getStatus(S);`
`258`	`258`	`}`
`259`	`259`	`};`
`260`	`260`
`@@ -285,9 +285,9 @@ class CCC_tf_Aniso : public CCC_Integer`
`285`	`285`	`CCC_Integer::Execute(args);`
`286`	`286`	`apply();`
`287`	`287`	`}`
`288`		`- virtual void Status(TStatus& S)`
	`288`	`+ virtual void getStatus(TStatus& S)`
`289`	`289`	`{`
`290`		`- CCC_Integer::Status(S);`
	`290`	`+ CCC_Integer::getStatus(S);`
`291`	`291`	`apply();`
`292`	`292`	`}`
`293`	`293`	`};`
`@@ -315,9 +315,9 @@ class CCC_tf_MipBias : public CCC_Float`
`315`	`315`	`CCC_Float::Execute(args);`
`316`	`316`	`apply();`
`317`	`317`	`}`
`318`		`- virtual void Status(TStatus& S)`
	`318`	`+ virtual void getStatus(TStatus& S)`
`319`	`319`	`{`
`320`		`- CCC_Float::Status(S);`
	`320`	`+ CCC_Float::getStatus(S);`
`321`	`321`	`apply();`
`322`	`322`	`}`
`323`	`323`	`};`
`@@ -639,7 +639,7 @@ class CCC_Dof : public CCC_Vector3`
`639`	`639`	`g_pGamePersistent->SetBaseDof(ps_r2_dof);`
`640`	`640`	`}`
`641`	`641`	`}`
`642`		`- virtual void Status(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); }`
	`642`	`+ virtual void getStatus(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); }`
`643`	`643`	`virtual void Info(TInfo& I)`
`644`	`644`	`{`
`645`	`645`	`xr_sprintf(I, "vector3 in range [%f,%f,%f]-[%f,%f,%f]", min.x, min.y, min.z, max.x, max.y, max.z);`
Original file line number	Diff line number	Diff line change
`@@ -446,14 +446,14 @@ void CConsole::DrawBackgrounds(bool bGame)`
`446`	`446`	`continue;`
`447`	`447`	`}`
`448`	`448`
`449`		`- r2.set_zero();`
	`449`	`+ r2.set_zero();`
`450`	`450`	`tmp.assign(ts.text.c_str(), ts.HL_start);`
`451`		`- r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());`
`452`		`- r2.y1 = pr.y1 + i * font_h;`
	`451`	`+ r2.x1 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());`
	`452`	`+ r2.y1 = pr.y1 + i * font_h;`
`453`	`453`
`454`	`454`	`tmp.assign(ts.text.c_str(), ts.HL_finish);`
`455`		`- r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());`
`456`		`- r2.y2 = r2.y1 + font_h;`
	`455`	`+ r2.x2 = pr.x1 + w1 + pFont->SizeOf_(tmp.c_str());`
	`456`	`+ r2.y2 = r2.y1 + font_h;`
`457`	`457`
`458`	`458`	`DrawRect(r2, tips_word_color);`
`459`	`459`
`@@ -564,7 +564,7 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd)`
`564`	`564`	`else`
`565`	`565`	`{`
`566`	`566`	`IConsole_Command::TStatus stat;`
`567`		`- cc->Status(stat);`
	`567`	`+ cc->getStatus(stat);`
`568`	`568`	`Msg("- %s %s", cc->Name(), stat);`
`569`	`569`	`}`
`570`	`570`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ LPCSTR CConsole::GetString(LPCSTR cmd) const`
`78`	`78`	`return NULL;`
`79`	`79`
`80`	`80`	`static IConsole_Command::TStatus stat;`
`81`		`- cc->Status(stat);`
	`81`	`+ cc->getStatus(stat);`
`82`	`82`	`return stat;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,12 @@ class ENGINE_API IConsole_Command`
`69`	`69`	`LPCSTR Name() { return cName; }`
`70`	`70`	`void InvalidSyntax();`
`71`	`71`	`virtual void Execute(LPCSTR args) = 0;`
`72`		`- virtual void Status(TStatus& S) { S[0] = 0; }`
	`72`	`+ virtual void getStatus(TStatus& S) { S[0] = 0; }`
`73`	`73`	`virtual void Info(TInfo& I) { xr_strcpy(I, "(no arguments)"); }`
`74`	`74`	`virtual void Save(IWriter* F)`
`75`	`75`	`{`
`76`	`76`	`TStatus S;`
`77`		`- Status(S);`
	`77`	`+ getStatus(S);`
`78`	`78`	`if (S[0])`
`79`	`79`	`F->w_printf("%s %s\r\n", cName, S);`
`80`	`80`	`}`
`@@ -110,7 +110,7 @@ class ENGINE_API CCC_Mask : public IConsole_Command`
`110`	`110`	`else`
`111`	`111`	`InvalidSyntax();`
`112`	`112`	`}`
`113`		`- virtual void Status(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }`
	`113`	`+ virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }`
`114`	`114`	`virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); }`
`115`	`115`	`virtual void fill_tips(vecTips& tips, u32 /mode/)`
`116`	`116`	`{`
`@@ -136,7 +136,7 @@ class ENGINE_API CCC_ToggleMask : public IConsole_Command`
`136`	`136`	`strconcat(sizeof(S), S, cName, " is ", value->test(mask) ? "on" : "off");`
`137`	`137`	`Log(S);`
`138`	`138`	`}`
`139`		`- virtual void Status(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }`
	`139`	`+ virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); }`
`140`	`140`	`virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); }`
`141`	`141`	`virtual void fill_tips(vecTips& tips, u32 /mode/)`
`142`	`142`	`{`
`@@ -175,7 +175,7 @@ class ENGINE_API CCC_Token : public IConsole_Command`
`175`	`175`	`if (!tok->name)`
`176`	`176`	`InvalidSyntax();`
`177`	`177`	`}`
`178`		`- virtual void Status(TStatus& S)`
	`178`	`+ virtual void getStatus(TStatus& S)`
`179`	`179`	`{`
`180`	`180`	`const xr_token* tok = GetToken();`
`181`	`181`	`while (tok->name)`
`@@ -255,7 +255,7 @@ class ENGINE_API CCC_Float : public IConsole_Command`
`255`	`255`	`else`
`256`	`256`	`*value = v;`
`257`	`257`	`}`
`258`		`- virtual void Status(TStatus& S)`
	`258`	`+ virtual void getStatus(TStatus& S)`
`259`	`259`	`{`
`260`	`260`	`xr_sprintf(S, sizeof(S), "%3.5f", *value);`
`261`	`261`	`while (xr_strlen(S) && ('0' == S[xr_strlen(S) - 1]))`
`@@ -305,7 +305,7 @@ class ENGINE_API CCC_Vector3 : public IConsole_Command`
`305`	`305`	`}`
`306`	`306`	`value->set(v);`
`307`	`307`	`}`
`308`		`- virtual void Status(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); }`
	`308`	`+ virtual void getStatus(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); }`
`309`	`309`	`virtual void Info(TInfo& I)`
`310`	`310`	`{`
`311`	`311`	`xr_sprintf(I, sizeof(I), "vector3 in range [%e,%e,%e]-[%e,%e,%e]", min.x, min.y, min.z, max.x, max.y, max.z);`
`@@ -344,7 +344,7 @@ class ENGINE_API CCC_Integer : public IConsole_Command`
`344`	`344`	`else`
`345`	`345`	`*value = v;`
`346`	`346`	`}`
`347`		`- virtual void Status(TStatus& S) { xr_itoa(*value, S, 10); }`
	`347`	`+ virtual void getStatus(TStatus& S) { xr_itoa(*value, S, 10); }`
`348`	`348`	`virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "integer value in range [%d,%d]", min, max); }`
`349`	`349`	`virtual void fill_tips(vecTips& tips, u32 mode)`
`350`	`350`	`{`
`@@ -370,7 +370,7 @@ class ENGINE_API CCC_String : public IConsole_Command`
`370`	`370`	`};`
`371`	`371`
`372`	`372`	`virtual void Execute(LPCSTR args) { strncpy_s(value, size, args, size - 1); }`
`373`		`- virtual void Status(TStatus& S) { xr_strcpy(S, value); }`
	`373`	`+ virtual void getStatus(TStatus& S) { xr_strcpy(S, value); }`
`374`	`374`	`virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "string with up to %d characters", size); }`
`375`	`375`	`virtual void fill_tips(vecTips& tips, u32 mode)`
`376`	`376`	`{`