mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-04 00:26:39 +00:00 
			
		
		
		
	Merge branch 'macos_water_compile_fix' into 'master'
Fix building water.cpp on macos See merge request OpenMW/openmw!2670
This commit is contained in:
		
						commit
						3a986d9a51
					
				
					 2 changed files with 3 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -1,6 +1,7 @@
 | 
			
		|||
#!/bin/sh -ex
 | 
			
		||||
 | 
			
		||||
export HOMEBREW_NO_EMOJI=1
 | 
			
		||||
brew tap --repair
 | 
			
		||||
brew update --quiet
 | 
			
		||||
 | 
			
		||||
# workaround python issue on travis
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,7 @@
 | 
			
		|||
#include "water.hpp"
 | 
			
		||||
 | 
			
		||||
#include <sstream>
 | 
			
		||||
 | 
			
		||||
#include <osg/ClipNode>
 | 
			
		||||
#include <osg/Depth>
 | 
			
		||||
#include <osg/Fog>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue