logo

Author: flipcoder

README.md

@@ -1,7 +1,4 @@
-Qor
-===
-
-[![Join the chat at https://gitter.im/flipcoder/qor](https://badges.gitter.im/flipcoder/qor.svg)](https://gitter.im/flipcoder/qor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+![Qor](http://github.com/qor/blob/master/qor.png)
 
 2D/3D OpenGL Game Engine (C++11 w/ Python scripting)
 

qor.png

@@ -1,13 +1,14 @@
-solution("base")
+workspace("base")
     targetdir("bin")
+    debugdir("bin")
 
     configurations {"Debug", "Release"}
-        defines { "GLM_FORCE_RADIANS", "QOR_NO_PYTHON", "QOR_NO_CAIRO", "QOR_NO_NET" }
+        defines { "GLM_FORCE_RADIANS", "NOMINMAX" }
 
         -- Debug Config
         configuration "Debug"
             defines { "DEBUG", "BACKWARD_HAS_BFD=1" }
-            flags { "Symbols" }
+            symbols "On"
             linkoptions { }
 
             configuration "gmake"
@@ -30,8 +31,6 @@ solution("base")
             -- buildoptions { "-std=c++11", "-pedantic", "-Wall", "-Wextra", '-v', '-fsyntax-only'}
             links {
                 "pthread",
-                "GL",
-                "GLU",
                 "SDL2_ttf",
                 "SDL2",
                 "GLEW",
@@ -43,14 +42,14 @@ solution("base")
                 "vorbis",
                 "vorbisfile",
                 "boost_system",
-                "boost_thread",
                 "boost_filesystem",
-                "boost_python",
                 "boost_coroutine",
+                "boost_python",
                 "boost_regex",
                 "jsoncpp",
                 "z",
-                "BulletSoftBody",
+                "RakNetDLL",
+                --"BulletSoftBody",
                 "BulletDynamics",
                 "BulletCollision",
                 "LinearMath",
@@ -77,57 +76,84 @@ solution("base")
                 "`python2-config --libs`",
                 "`pkg-config --libs cairomm-1.0 pangomm-1.4`"
             }
+
+        configuration "linux"
+            links {
+                "GL",
+                "boost_thread",
+            }
+
         -- OS X Config
         configuration "macosx"
+            links {
+                "boost_thread-mt",
+            }
+            buildoptions { "-framework OpenGL" }
+            linkoptions { "-framework OpenGL" }
+
             buildoptions { "-U__STRICT_ANSI__", "-stdlib=libc++" }
             linkoptions { "-stdlib=libc++" }
 
         configuration "windows"
+            toolset "v141"
+            flags { "MultiProcessorCompile" }
+        
             links {
                 "ws2_32",
-                --"glibmm.dll",
-                --"cairomm.dll",
-                --"pangomm.dll",
+                "glibmm.dll.lib",
+                "cairomm.dll.lib",
+                "pangomm.dll.lib",
                 "SDL2main",
                 "OpenGL32",
                 "GLU32",
-                "SDL2_ttf",
                 "SDL2",
+                "SDL2_ttf",
                 "GLEW32",
                 "assimp",
                 "freeimage",
-                "openal32",
+                "OpenAL32",
                 "alut",
                 "libogg",
                 "libvorbis",
                 "libvorbisfile",
-                "boost_system-vc140-mt-1_61",
-                "boost_thread-vc140-mt-1_61",
-                "boost_python-vc140-mt-1_61",
-                "boost_coroutine-vc140-mt-1_61",
-                "boost_regex-vc140-mt-1_61",
+                --"boost_system-vc141-mt-1_64",
+                --"boost_filesystem-vc141-mt-1_64",
+                --"boost_thread-vc141-mt-1_64",
+                "python27",
+                --"boost_python-vc141-mt-1_64",
+                --"boost_coroutine-vc141-mt-1_64",
+                --"boost_regex-vc141-mt-1_64",
                 "lib_json",
-                "BulletSoftBody",
-                "BulletDynamics",
-                "BulletCollision",
-                "LinearMath",
             }
 
             includedirs {
-                "c:/local/boost_1_61_0",
+                "c:/Python27/include",
+                "c:/gtkmm/lib/pangomm/include",
+                "c:/gtkmm/lib/sigc++/include",
+                "c:/gtkmm/lib/cairomm/include",
+                "c:/gtkmm/include/pango",
+                "c:/gtkmm/include/pangomm",
+                "c:/gtkmm/include/sigc++",
+                "c:/gtkmm/include",
+                "c:/gtkmm/include/cairo",
+                "c:/gtkmm/lib/glib/include",
+                "c:/gtkmm/include/glib",
+                "c:/gtkmm/lib/glibmm/include",
+                "c:/gtkmm/include/glibmm",
+                "c:/gtkmm/include/cairomm",
+                "c:/gtkmm/include",
+                "c:/local/boost_1_64_0",
                 "c:/Program Files (x86)/OpenAL 1.1 SDK/include",
                 "c:/msvc/include",
             }
             configuration { "windows", "Debug" }
                 libdirs { "c:/msvc/lib32/debug" }
                 links {
-                    "libboost_filesystem-vc140-mt-gd-1_61",
                     "RakNet_VS2008_LibStatic_Debug_Win32",
                 }
             configuration {}
             configuration { "windows", "Release" }
                 links {
-                    "libboost_filesystem-vc140-mt-1_61",
                     "RakNet_VS2008_LibStatic_Release_Win32",
                 }
             configuration { "windows" }
@@ -136,13 +162,10 @@ solution("base")
                 "c:/Program Files (x86)/OpenAL 1.1 SDK/libs/Win32",
                 "c:/msvc/lib32",
                 "c:/gtkmm/lib",
-                "c:/local/boost_1_61_0/lib32-msvc-14.0",
+                "c:/local/boost_1_64_0/lib32-msvc-14.1",
+                "C:/Python27/libs",
             }
-            -- buildoptions {
-                -- "/MP",
-                -- "/Gm-",
-            -- }
-
+            
     project "base"
         kind "WindowedApp"
         language "C++"
@@ -176,3 +199,4 @@ solution("base")
             "/usr/include/bullet/",
             "/usr/include/raknet/DependentExtensions"
         }
+