Linux build fixes

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2089 1509560c-5e2a-0410-865c-31c25e1cfdef
crayfellow · Sep 25, 2012 · eee7e79 · eee7e79
1 parent e29c898
commit eee7e79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/project/common/Utils.cpp b/project/common/Utils.cpp
@@ -519,24 +519,24 @@ void GetSpecialDir(SpecialDir inDir,std::string &outDir)
 	{
 		if (getenv("XDG_CONFIG_HOME") != NULL)
 		{
-			outDir = getEnv ("XDG_CONFIG_HOME") + "/" + gPackage;
+			outDir = std::string(getenv ("XDG_CONFIG_HOME")) + "/" + gPackage;
 		}
 		else
 		{
-			outDir = getEnv ("HOME") + "/.config/" + gPackage;
+			outDir = std::string(getenv ("HOME")) + "/.config/" + gPackage;
 		}
 	}
 	else if (inDir == DIR_USER)
 	{
-		outDir = getEnv ("HOME");
+		outDir = getenv ("HOME");
 	}
 	else if (inDir == DIR_DOCS)
 	{
 		outDir = "$HOME/Documents";
 	}
 	else if (inDir == DIR_DESKTOP)
 	{
-		outDir = "$HOME/Desktop"
+		outDir = "$HOME/Desktop";
 	}
 #endif
 }

diff --git a/project/opengl/OGL.h b/project/opengl/OGL.h
@@ -24,7 +24,10 @@
 // Mac/Linux....
 #include <SDL_opengl.h>
 #define FORCE_NON_PO2
+
+#ifndef HX_LINUX
 #define ALLOW_OGL2
+#endif
 
 #else