(svn r1003) Mac: reintroduced the static libpng hack in makefile since it appears to be needed in the nightly builds
This commit is contained in:
		
							
								
								
									
										5
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								Makefile
									
									
									
									
									
								
							@@ -425,7 +425,12 @@ CFLAGS += `libpng-config --cflags`
 | 
				
			|||||||
# seems like older libpng versions are broken and need this
 | 
					# seems like older libpng versions are broken and need this
 | 
				
			||||||
PNGCONFIG_FLAGS = --ldflags --libs
 | 
					PNGCONFIG_FLAGS = --ldflags --libs
 | 
				
			||||||
ifdef STATIC
 | 
					ifdef STATIC
 | 
				
			||||||
 | 
					ifdef OSX
 | 
				
			||||||
 | 
					# Seems like we need a tiny hack for OSX static to work
 | 
				
			||||||
 | 
					LIBS += `libpng-config --prefix`/lib/libpng.a
 | 
				
			||||||
 | 
					else
 | 
				
			||||||
LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)`
 | 
					LIBS += `libpng-config --static $(PNGCONFIG_FLAGS)`
 | 
				
			||||||
 | 
					endif
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
LIBS += `libpng-config  --L_opts $(PNGCONFIG_FLAGS)`
 | 
					LIBS += `libpng-config  --L_opts $(PNGCONFIG_FLAGS)`
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user