Merge branch 'master' into discrete-tests
This commit is contained in:
		
						commit
						06418c0b9c
					
				
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@ -1,3 +1,3 @@
 | 
			
		||||
~*
 | 
			
		||||
/bin
 | 
			
		||||
bin
 | 
			
		||||
/.vscode
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							@ -17,7 +17,7 @@ RMRF  = rm -rf
 | 
			
		||||
AR    = ar crs
 | 
			
		||||
CP    = cp
 | 
			
		||||
 | 
			
		||||
$(DEBUG_PATH)/obj/%.o:   CFLAGS := $(CFLAGS) -DDEBUG  -Og -fPIC -c -g3 -Wall
 | 
			
		||||
$(DEBUG_PATH)/obj/%.o:   CFLAGS := $(CFLAGS) -DDEBUG  -O0 -fPIC -c -g3 -Wall
 | 
			
		||||
$(RELEASE_PATH)/obj/%.o: CFLAGS := $(CFLAGS) -DNDEBUG -O2 -fPIC -c
 | 
			
		||||
 | 
			
		||||
########################################################################################################################
 | 
			
		||||
@ -91,7 +91,7 @@ clean:
 | 
			
		||||
	cd ./modules/libunic && $(MAKE) clean
 | 
			
		||||
 | 
			
		||||
%.a:
 | 
			
		||||
	$(AR) $@ $^
 | 
			
		||||
	$(AR) $@ $?
 | 
			
		||||
 | 
			
		||||
########################################################################################################################
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user