Add an osinclude.h below each OS directory, redirects by platform macro

CMakeLists.txt

@@ -7,8 +7,10 @@ project(glslang)
 if(WIN32)
     set(CMAKE_GENERATOR_TOOLSET "v110" CACHE STRING "Platform Toolset" FORCE)
     include(ChooseMSVCCRT.cmake)
+    add_definitions(-DGLSLANG_OSINCLUDE_WIN32)
 elseif(UNIX)
     add_definitions(-fPIC)
+    add_definitions(-DGLSLANG_OSINCLUDE_UNIX)
 else(WIN32)
     message("unkown platform")
 endif(WIN32)

OGLCompilersDLL/InitializeDll.h

@@ -35,7 +35,7 @@
 #define __INITIALIZEDLL_H
 
 
-#include "osinclude.h"
+#include "../glslang/OSDependent/osinclude.h"
 
 namespace glslang {
 

StandAlone/StandAlone.cpp

@@ -49,7 +49,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "osinclude.h"
+#include "../glslang/OSDependent/osinclude.h"
 
 extern "C" {
     SH_IMPORT_EXPORT void ShOutputHtml();

StandAlone/Worklist.h

@@ -35,7 +35,7 @@
 #ifndef WORKLIST_H_INCLUDED
 #define WORKLIST_H_INCLUDED
 
-#include "osinclude.h"
+#include "../glslang/OSDependent/osinclude.h"
 #include <string>
 #include <list>
 

glslang/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8)
 if(WIN32)
     add_subdirectory(OSDependent/Windows)
 elseif(UNIX)
-    add_subdirectory(OSDependent/Linux)
+    add_subdirectory(OSDependent/Unix)
 else(WIN32)
     message("unkown platform")
 endif(WIN32)

glslang/MachineIndependent/ParseHelper.cpp

@@ -37,7 +37,7 @@
 #include "ParseHelper.h"
 #include "Scan.h"
 
-#include "osinclude.h"
+#include "../OSDependent/osinclude.h"
 #include <stdarg.h>
 #include <algorithm>
 

glslang/MachineIndependent/PoolAlloc.cpp

@@ -36,7 +36,7 @@
 #include "../Include/Common.h"
 
 #include "../Include/InitializeGlobals.h"
-#include "osinclude.h"
+#include "../OSDependent/osinclude.h"
 
 namespace glslang {
 

glslang/OSDependent/osinclude.h

+//
+//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.
+//All rights reserved.
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions
+//are met:
+//
+//    Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+//
+//    Redistributions in binary form must reproduce the above
+//    copyright notice, this list of conditions and the following
+//    disclaimer in the documentation and/or other materials provided
+//    with the distribution.
+//
+//    Neither the name of 3Dlabs Inc. Ltd. nor the names of its
+//    contributors may be used to endorse or promote products derived
+//    from this software without specific prior written permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+//POSSIBILITY OF SUCH DAMAGE.
+//
+
+#ifndef __ROOT_OSINCLUDE_H
+#define __ROOT_OSINCLUDE_H
+
+#if defined(GLSLANG_OSINCLUDE_WIN32)
+#include "Windows/osinclude.h"
+#elif defined(GLSLANG_OSINCLUDE_UNIX)
+#include "Unix/osinclude.h"
+#else
+#error "Unknown platform"
+#endif
+
+#endif // __ROOT_OSINCLUDE_H