Merge branch 'patch-1' of https://github.com/roberthauck/nana into roberthauck-patch-1
This commit is contained in:
		
						commit
						7ce97727d1
					
				@ -34,8 +34,13 @@ if(BIICODE)
 | 
				
			|||||||
    # we'll use the default config file so we can iliminate the following macro definitions
 | 
					    # we'll use the default config file so we can iliminate the following macro definitions
 | 
				
			||||||
    if(MSVC)
 | 
					    if(MSVC)
 | 
				
			||||||
        # More MSVC specific compilation flags
 | 
					        # More MSVC specific compilation flags
 | 
				
			||||||
		add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 | 
						add_definitions(-D_SCL_SECURE_NO_WARNINGS)
 | 
				
			||||||
		add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 | 
						add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
 | 
				
			||||||
 | 
						if(MSVC14)
 | 
				
			||||||
 | 
							add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
 | 
				
			||||||
 | 
						else()
 | 
				
			||||||
 | 
							add_definitions(-DNOT_IMPLEMENTED_KEYWORD_noexcept)
 | 
				
			||||||
 | 
						endif()
 | 
				
			||||||
    endif()
 | 
					    endif()
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    add_biicode_targets()
 | 
					    add_biicode_targets()
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user