Merge branch 'master' into sdl_extract
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -15,7 +15,6 @@ build/android/libs/
 | 
				
			|||||||
build/android/obj/
 | 
					build/android/obj/
 | 
				
			||||||
build/itch.io/tic.js
 | 
					build/itch.io/tic.js
 | 
				
			||||||
build/itch.io/console.zip
 | 
					build/itch.io/console.zip
 | 
				
			||||||
build/html/tic.js
 | 
					 | 
				
			||||||
build/uwp/code8/ARM/
 | 
					build/uwp/code8/ARM/
 | 
				
			||||||
build/uwp/code8/x64/
 | 
					build/uwp/code8/x64/
 | 
				
			||||||
build/uwp/code8/code8.VC.db
 | 
					build/uwp/code8/code8.VC.db
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										28
									
								
								build/html/tic.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								build/html/tic.js
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
OPT=-O3 -Wall -std=c99
 | 
					OPT=-O3 -Wall -std=c99
 | 
				
			||||||
SRC=bin2txt.c
 | 
					SRC=bin2txt.c
 | 
				
			||||||
3RD_PARTY = ../../../3rd-party
 | 
					3RD_PARTY = ../../3rd-party
 | 
				
			||||||
INCLUDE=-I$(3RD_PARTY)/zlib-1.2.8
 | 
					INCLUDE=-I$(3RD_PARTY)/zlib-1.2.8
 | 
				
			||||||
PRE_BUILT = $(3RD_PARTY)/pre-built
 | 
					PRE_BUILT = $(3RD_PARTY)/pre-built
 | 
				
			||||||
LIB=-lz
 | 
					LIB=-lz
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user