Move ImportExportMacros.inl into Compiler.inl

Remove include guard for inlining_macros.h
OpenXRay · Nov 15, 2017 · 7be8e73 · 7be8e73
1 parent dd2616a
commit 7be8e73
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 18 deletions.
diff --git a/src/Common/Common.vcxproj b/src/Common/Common.vcxproj
@@ -204,7 +204,6 @@
  <ClInclude Include="PlatformLinux.inl" />
  <ClInclude Include="PlatformWindows.inl" />
  <ClInclude Include="Util.hpp" />
- <ClInclude Include="ImportExportMacros.inl" />
  <ClInclude Include="_d3d_extensions.h" />
  </ItemGroup>
  <ItemGroup>

diff --git a/src/Common/Common.vcxproj.filters b/src/Common/Common.vcxproj.filters
@@ -81,9 +81,6 @@
  <ClInclude Include="..\xrCommon\xr_deque.h">
  <Filter>xrCommon</Filter>
  </ClInclude>
- <ClInclude Include="ImportExportMacros.inl">
- <Filter>Platform</Filter>
- </ClInclude>
  <ClInclude Include="Common.hpp" />
  </ItemGroup>
  <ItemGroup>

diff --git a/src/Common/Compiler.inl b/src/Common/Compiler.inl
@@ -6,7 +6,14 @@
 #include <intrin.h> // for __debugbreak
 #endif
 
-#include "Common/ImportExportMacros.inl"
+#if defined(__GNUC__)
+#define XR_EXPORT __attribute__ ((visibility("default")))
+#define XR_IMPORT __attribute__ ((visibility("default")))
+#elif defined(_MSC_VER)
+#define XR_EXPORT __declspec(dllexport)
+#define XR_IMPORT __declspec(dllimport)
+#endif
+
 #include "xrCommon/inlining_macros.h"
 
 #if defined(__GNUC__)

diff --git a/src/Common/ImportExportMacros.inl b/src/Common/ImportExportMacros.inl
diff --git a/src/xrCommon/inlining_macros.h b/src/xrCommon/inlining_macros.h
@@ -1,6 +1,4 @@
 #pragma once
-#ifndef INLINING_MACROS_H
-#define INLINING_MACROS_H
 
 #if defined(__GNUC__)
 #define NO_INLINE __attribute__((noinline))
@@ -19,5 +17,3 @@
 #define IC inline
 #define ICF FORCE_INLINE
 #define ICN NO_INLINE
-
-#endif