Linux

src/render/ShaderManager.cpp

@@ -173,6 +173,8 @@ namespace ZL {
                             "Fragment shader: %s", fragmentShaderFileName.c_str());
 #endif
 
+        std::cout <<"Loading shader: " << shaderName << " " << vertexShaderFileName << " " << fragmentShaderFileName <<std::endl;
+
         std::string vertexShader;
         std::string fragmentShader;
 

src/render/TextureManager.cpp

@@ -11,6 +11,10 @@ namespace ZL
 	using std::min;
 	using std::max;
 #endif
+#ifdef __linux__
+    using std::min;
+    using std::max;
+#endif
 
 	bool IsPowerOf2(size_t n) {
 		return n > 0 && (n & (n - 1)) == 0;
@@ -533,7 +537,7 @@ namespace ZL
 
 	void TextureManager::UnloadByPrefix(const std::string& prefix)
 	{
-		for (auto& it = textureMap.begin(); it != textureMap.end(); ) {
+		for (auto it = textureMap.begin(); it != textureMap.end(); ) {
 			if (it->first.substr(0, prefix.size()) == prefix) {
 				std::cout << "Unloading texture with prefix: " << it->first << std::endl;
 				it = textureMap.erase(it);