Merge pull request #250 from q4a/linux-merge

Continue Linux port
OpenXRay · Oct 10, 2018 · 686f5db · 686f5db
2 parents 523f754 + a7f2240
commit 686f5db
Show file tree

Hide file tree

Showing 1,740 changed files with 7,986 additions and 5,590 deletions.
diff --git a/Externals/openal/include/openal/alc.h b/Externals/openal/include/openal/alc.h
@@ -272,9 +272,10 @@ typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, A
 }
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX)
 typedef void __cdecl log_fn_ptr_type(char*);
 extern ALC_API log_fn_ptr_type*	pLog ;
-
+#endif
 void AlLog(char* format, ...);
 
 #endif /* AL_ALC_H */
diff --git a/README.md b/README.md
@@ -16,7 +16,9 @@ and work on the source code.
 
 Changelist is available in [wiki](https://github.com/OpenXRay/xray-16/wiki/Changes).
 
-Build instructions: [doc/howto/build.txt](doc/howto/build.txt)
+Build instructions (Windows): [doc/howto/build.txt](doc/howto/build.txt)
+
+Build instructions (Linux): [doc/howto/build-linux.txt](doc/howto/build-linux.txt)
 
 If you find a bug or have an enhancement request, file an [Issue](https://github.com/openxray/xray-16/issues).
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -68,7 +68,7 @@ deploy:
   release: OpenXRay (build $(appveyor_build_version))
   description: $(APPVEYOR_REPO_COMMIT_MESSAGE)
   auth_token:
-    secure: kGVniXDR926BfVcA97y25BzALbijvgboBsozZzY9yc8RPz15Q4YG474h7vl14/J1
+    secure: EwMP7ob9Q7cE1EvW72ybDSYjbD44IQRDFhbCQcdOuBSSz9PbO/Pq2ZUNuMqPuvsV
   artifact:
     OpenXRay.Dx86.7z, OpenXRay.Dx64.7z, OpenXRay.Mx86.7z, OpenXRay.Mx64.7z, OpenXRay.Rx86.7z, OpenXRay.Rx64.7z,
     Symbols.Dx86.7z, Symbols.Dx64.7z, Symbols.Mx86.7z, Symbols.Mx64.7z, Symbols.Rx86.7z, Symbols.Rx64.7z

diff --git a/sdk/include/loki/HierarchyGenerators.h b/sdk/include/loki/HierarchyGenerators.h
@@ -29,7 +29,7 @@
 #define HIERARCHYGENERATORS_INC_
 
 #include "Typelist.h"
-#include "TypeTraits.h"
+#include "TypeManip.h"
 #include "EmptyType.h"
 
 namespace Loki
@@ -158,9 +158,9 @@ namespace Loki
         >
         ::Result TList;
 
-        template <typename T> struct Rebind
+        template <typename U> struct Rebind
         {
-            typedef Unit<T> Result;
+            typedef Unit<U> Result;
         };
     };
 
@@ -228,7 +228,7 @@ namespace Loki
             typedef typename TL::TypeAt<typename H::TList, i>::Result ElementType;
             typedef typename H::template Rebind<ElementType>::Result UnitType;
 
-            enum { isConst = TypeTraits<H>::isConst };
+            static constexpr bool isConst = std::is_const_v<H>;
 
             typedef typename Select
             <
@@ -273,7 +273,7 @@ namespace Loki
             typedef typename H::TList::Head ElementType;
             typedef typename H::template Rebind<ElementType>::Result UnitType;
 
-            enum { isConst = TypeTraits<H>::isConst };
+            static constexpr bool isConst = std::is_const_v<H>;
 
             typedef typename Select
             <

diff --git a/sdk/include/loki/TypeManip.h b/sdk/include/loki/TypeManip.h
@@ -60,17 +60,7 @@ namespace Loki
     template <bool flag, typename T, typename U>
     struct Select
     {
-    private:
-        template<bool>
-        struct In 
-        { typedef T Result; };
-
-        template<>
-        struct In<false>
-        { typedef U Result; };
-
-    public:
-        typedef typename In<flag>::Result Result;
+        using Result = std::conditional_t<flag, T, U>;
     };
 
 
@@ -84,20 +74,8 @@ namespace Loki
 ////////////////////////////////////////////////////////////////////////////////
 
     template <typename T, typename U>
-    struct IsSameType
-    {
-    private:
-        template<typename>
-        struct In 
-        { enum { value = false }; };
-
-        template<>
-        struct In<T>
-        { enum { value = true };  };
-
-    public:
-        enum { value = In<U>::value };
-    };
+    struct IsSameType : std::is_same<T, U>
+    {};
 
 ////////////////////////////////////////////////////////////////////////////////
 // Helper types Small and Big - guarantee that sizeof(Small) < sizeof(Big)