Changed where third party libs' files are placed in the project

README.md

@@ -155,9 +155,6 @@
 
 - ## TODO
 
-	- Move third party libs/include directories into root/lib and root/include. Put common includes like header-only libs into root/include/common and others which require platform specific stuff into root/include/linux etc.
-	- Implement necessary changes to run Soloud on linux
-	- Get rid of pkg-confg and system-installed SDL2 dependancy on linux and instead put custom compiled SDL libs in third_party similar to how we're handling it in windows
 	- Add fallback shader
 	- Implement Game States
 	- Store Materials in new format supported by parser
@@ -342,3 +339,6 @@
 	* Fixed bugs related to changing camera projection
 	* Fixed bugs with sprite batch renderer not working with projection matrix
 	* Fixed broken orthographic camera
+	* Implement necessary changes to run Soloud on linux
+	* Moved third party libs/include directories into root/lib and root/include. Put common includes like header-only libs into root/include/common and others which require platform specific stuff into root/include/linux etc.
+	* Got rid of pkg-confg and system-installed SDL2 dependancy on linux and instead put custom compiled SDL libs in libs folder similar to how we're handling it in windows

build/genie.lua

@@ -2,26 +2,13 @@ solution "Symmetry"
 	configurations { "Debug", "Release" }
 	platforms {"x64"}
 	location(_ACTION)
-	defines {"USE_GLAD"}
-	includedirs {"../include/"}
 
 	configuration {"linux"}
 	    postbuildcommands {"ln -fs " .. os.getcwd()  .. "/../assets debug/assets"}
 	    postbuildcommands {"ln -fs " .. os.getcwd()  .. "/../assets release/assets"}
 		buildoptions {"-Wall", "-std=c99", "`pkg-config --cflags-only-I sdl2`"}
 
-	configuration {"windows", "gmake"}
-	    postbuildcommands {"rm -rf debug/assets"}
-	    postbuildcommands {"rm -rf release/assets"}
-	    postbuildcommands {"ln -fs " .. os.getcwd()  .. "/../assets debug/assets"}
-	    postbuildcommands {"ln -fs " .. os.getcwd()  .. "/../assets release/assets"}
-		buildoptions {"-Wall", "-std=c99"}
-
-
-   configuration {"windows", "vs2017 or qbs"}
-	local sdl_lib_dir    = "../third_party/windows/SDL2-2.0.5/lib/x64/"
-	local soloud_lib_dir = "../third_party/windows/Soloud/lib/"
-	
+   configuration {"windows", "vs2017"}	
 	defines {"_CRT_SECURE_NO_WARNINGS"}
 	flags {"NoIncrementalLink", "NoEditAndContinue"}
 
@@ -52,20 +39,13 @@ solution "Symmetry"
 			defines {"GAME"}
 
 			configuration "linux"
-			    includedirs	{"../third_party/linux/SDL2/include/", "../third_party/linux/Soloud/include/"}
-				buildoptions {"`pkg-config --cflags-only-other sdl2`"}
-				linkoptions {"`pkg-config --libs sdl2`"}
-				libdirs {"../third_party/linux/Soloud/lib/"}
-				links {"m"}
-
-			configuration {"windows", "gmake"}
-				buildoptions {"`pkg-config --cflags-only-I sdl2`"}
-				linkoptions {"`pkg-config --libs sdl2`"}
-				links {"m"}
-
-			configuration {"windows", "vs2017 or qbs"}
-			   includedirs {"../third_party/windows/SDL2-2.0.5/include/", "../third_party/windows/Soloud/include/"}
-			   libdirs { sdl_lib_dir, soloud_lib_dir }
+			    includedirs	{"../include/linux/sdl2/", "../include/common/soloud/"}
+				libdirs {"../lib/linux/sdl2/", "../lib/linux/soloud/"}
+				links {"SDL2", "m"}
+
+			configuration {"windows", "vs2017"}
+			   includedirs	{"../include/windows/sdl2/", "../include/common/soloud/"}
+			   libdirs {"../lib/windows/sdl2/", "../lib/windows/soloud/"}
 			   links {"SDL2"}
 				
 			configuration "Debug"
@@ -101,10 +81,10 @@ solution "Symmetry"
 					  end
 
 					  local success = false
-					  success = os.copyfile(sdl_lib_dir .. "SDL2.dll", copy_dest_dir .. "/debug/SDL2.dll")
-					  success = os.copyfile(sdl_lib_dir .. "SDL2.dll", copy_dest_dir .. "/release/SDL2.dll")
-					  success = os.copyfile(soloud_lib_dir .. "soloud_x64_d.dll", copy_dest_dir .. "/debug/soloud_x64_d.dll")
-					  success = os.copyfile(soloud_lib_dir .. "soloud_x64.dll", copy_dest_dir .. "/release/soloud_x64.dll")
+					  success = os.copyfile("../libs/windows/sdl2/SDL2.dll", copy_dest_dir .. "/debug/SDL2.dll")
+					  success = os.copyfile("../libs/windows/sdl2/SDL2.dll", copy_dest_dir .. "/release/SDL2.dll")
+					  success = os.copyfile("../libs/windows/soloud_x64_d.dll", copy_dest_dir .. "/debug/soloud_x64_d.dll")
+					  success = os.copyfile("../libs/windows/soloud_x64.dll", copy_dest_dir .. "/release/soloud_x64.dll")
 					  
 
 					  if success ~= true then
@@ -139,19 +119,20 @@ solution "Symmetry"
 		    kind "SharedLib"
 			language "C"
 			targetname "Symmetry"
-			defines {"GAME_LIB"}
+			defines {"GAME_LIB", "USE_GLAD"}
+			includedirs {"../include/common"}
 			files { "../src/common/**.c", "../src/common/**.h", "../src/libsymmetry/**.h", "../src/libsymmetry/**.c" }
 
 			configuration "windows"
 			    targetname "libSymmetry"
 				
 			configuration {"windows", "vs2017"}
-				includedirs {"../third_party/windows/SDL2-2.0.5/include/"}
+				includedirs {"../include/windows/sdl2/"}
 				flags "NoImportLib"
 
 
 			configuration {"linux"}
-			    includedirs {"../third_party/linux/SDL2/include/"}
+			    includedirs {"../include/linux/sdl2/"}
 			
 			configuration "Debug"
 		        defines {"GL_DEBUG_CONTEXT"}

include/common/KHR/khrplatform.h

@@ -102,8 +102,7 @@
 #elif defined (__SYMBIAN32__)
 #   define KHRONOS_APICALL IMPORT_C
 #elif defined(__ANDROID__)
-#   include <sys/cdefs.h>
-#   define KHRONOS_APICALL __attribute__((visibility("default"))) __NDK_FPABI__
+#   define KHRONOS_APICALL __attribute__((visibility("default")))
 #else
 #   define KHRONOS_APICALL
 #endif