Merge pull request #71 from timgates42/bugfix_typo_collisions

docs: fix simple typo, colisions -> collisions

Makefile

@@ -412,7 +412,7 @@ gdb:
 llvm:
 	rm -rf $(BUILD)/llvm-debug
 	mkdir -p $(BUILD)/llvm-debug
-	cd $(BUILD)/llvm-debug && LDFLAGS="$(LLVMLDFLAGS)" CFLAGS="$(LLVMCFLAGS)" CXXFLAGS="$(LLVMCXXFLAGS)" cmake -G "Unix Makefiles" \
+	cd $(BUILD)/llvm-debug && LDFLAGS="$(LLVMLDFLAGS)" CFLAGS="$(LLVMCFLAGS)" CXXFLAGS="$(LLVMCXXFLAGS)" $(SRCROOT)/sdk/usr/bin/cmake -G "Unix Makefiles" \
 		$(LLVMCMAKEOPTS) -DCMAKE_INSTALL_PREFIX=$(LLVMINSTALLPREFIX)/llvm-install -DCMAKE_BUILD_TYPE=$(BUILDTYPE) -DLLVM_BUILD_CLANG=$(CLANG) \
 		-DLLVM_ENABLE_ASSERTIONS=$(ASSERTIONS) -DLLVM_BUILD_GOLDPLUGIN=ON -DBINUTILS_INCDIR=$(SRCROOT)/binutils/include \
 		-DLLVM_TARGETS_TO_BUILD="AVM2;AVM2Shim;X86;CBackend" -DLLVM_NATIVE_ARCH="avm2" -DLLVM_INCLUDE_TESTS=$(BUILD_LLVM_TESTS) -DLLVM_INCLUDE_EXAMPLES=OFF \
@@ -715,7 +715,7 @@ libobjc:
 	rm -rf $(BUILD)/libobjc
 	mkdir -p $(BUILD)/libobjc
 	python $(SRCROOT)/tools/build-objc.py $(SRCROOT)/cached_build/libobjc/compile.log $(SRCROOT)/cached_build/libobjc/install.log $(SRCROOT) > $(BUILD)/libobjc/build.sh
-	cd $(BUILD)/libobjc && PATH=$(SDK)/usr/bin:$(PATH) bash -x build.sh
+	cd $(BUILD)/libobjc && PATH="$(SDK)/usr/bin:$(PATH)" bash -x build.sh
 	# link bitcode
 	cd $(BUILD)/libobjc && rm -f libobjc.a && mkdir NXConstStr && mv NXConstStr.o NXConstStr/. && $(SDK)/usr/bin/llvm-link -o libobjc.o *.o && $(AR) libobjc.a libobjc.o NXConstStr/*.o && cp libobjc.a $(SDK)/usr/lib/.
 

README.md

@@ -1,6 +1,12 @@
-# Crossbridge
+# Project Status
 
-Crossbridge is the open-source version of Adobe FlasCC (formerly the Alchemy project). It provides a complete C/C++ development environment for targetting the Adobe Flash Runtime.
+Sadly this project is no longer being actively maintained by Adobe, if you want to contribute to improving crossbridge you might want to help out on a more active fork like the one here: https://github.com/vpmedia/crossbridge/
+
+# [Crossbridge](http://www.crossbridge.io) 
+
+Crossbridge is the open-source version of Adobe FlasCC (formerly the Alchemy project). It provides a complete C/C++ development environment for targetting the Adobe Flash Runtime.  
+For more information about this project, please visit http://adobe-flash.github.io/crossbridge/.  
+To get the latest release version, please visit the http://sourceforge.net/projects/crossbridge/files/.
 
 Features:
 
@@ -14,4 +20,18 @@ The master branch contains all of the code necessary to build crossbridge 1.0.1,
 
 Both the mac and cygwin SDKs are built on mac, you will need XCode and some macports packages installed to be able to build (pkg-config, glib, and mercurial).
 
-Doing a "make" in the root directory should be sufficient to build just the mac sdk, doing "make; make win; make deliverables" should build both mac and windows and package them as dmg and zips
+Doing a "make" in the root directory should be sufficient to build just the mac sdk, doing "make; make win; make deliverables" should build both mac and windows and package them as dmg and zips
+
+### Future
+Futures branch contains the upgrading code.
+Comparing to master, it will mainly has
+* Clang/LLVM 3.2 toolchain 
+* Freebsd 9.1 Environment
+* Libc++ with support of c++11 std.
+
+### Start using crossbridge
+Download a copy of SDK for your OS at http://sourceforge.net/projects/crossbridge/files/
+Open README.html to get a basic idea of crossbridge usage.
+
+### License
+The code written by adobe is all MIT licensed, but crossbridge contains many different open source projects which have different licenses, check the source files before making any assumptions.

gdb-7.3/gdb/varobj.c

@@ -462,7 +462,7 @@ static int format_code[] = { 0, 't', 'd', 'x', 'o' };
 static struct varobj_root *rootlist;
 
 /* Prime number indicating the number of buckets in the hash table.  */
-/* A prime large enough to avoid too many colisions.  */
+/* A prime large enough to avoid too many collisions.  */
 #define VAROBJ_TABLE_SIZE 227
 
 /* Pointer to the varobj hash table (built at run time).  */