Conflicts: CubeControl/makefile

пре 12 година · 6ac0c79d8a
--- a/CubeControl/makefile
+++ b/CubeControl/makefile
 
															
															 HEADERPATH = /System/Library/Frameworks/JavaVM.framework/Headers
														
 
															
															 ifdef SystemRoot
														
 
															
															-HEADERPATH = C:/Program\ Files/Java/jdk1.6.0_29/include
														
 
															
															+HEADERPATH = C:\Program\ Files\Java\jdk1.6.0_29\include
														
 
															
															 endif
														
 
															
															 # All java files to be compiled