Prepare for merge

2 files changed, 21 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 4a60dec..b7b693a 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ else
 	UNAME:=$(shell uname -s)
 endif
 
+CP=cp
 ifeq ($(UNAME), Windows)
 	EXE_EXT=.exe
 	STA_LIB_EXT=.a
@@ -121,7 +122,7 @@ endif
 S_LDFLAGS= $(SERVER_LIBS)
 C_LDFLAGS= $(CLIENT_LIBS)
 ifeq ($(UNAME),Windows)
-	C_LDFLAGS += -mwindows -lwinmm
+	C_LDFLAGS += -mwindows -lwinmm -lstdc++
 	ifeq ($(DEBUG),true)
 
 	else
@@ -170,7 +171,7 @@ CLIENT_OBJS = $(BUILD_DIR)/$(CLIENTNAME)/main.o $(CLIENT_SRCS) $(SHARED_CLIENT_O
 #Compile the client
 $(BIN_DIR)/$(CLIENTNAME)/bin/$(EX_PRE)$(CLIENTNAME)$(EXE_EXT) : $(CLIENT_OBJS) $(LIB_OBJS)
 	@echo "[CLIENT] Building binary $@"
-	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(C_LDFLAGS) $(LIB_OBJS) # -Wl,--verbose
+	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(C_LDFLAGS) $(LIB_OBJS) # -Wl,--verbose
 
 # does not have .hpp associated
 $(BUILD_DIR)/$(CLIENTNAME)/main.o : $(SRC_DIR)/client/main.cpp
@@ -209,7 +210,7 @@ $(SHARED_SERVER_OBJS) : $(BUILD_DIR)/$(SERVERNAME)/%.o : $(SRC_DIR)/shared/%.cpp
 $(LIBLUA) : $(ILUADIR)/Makefile
 	@echo "Could not find $(LIBLUA), rebuilding"
 	cd $(ILUADIR) && $(MAKE) "BUILDMODE= static"
-	cp $(ILUADIR)/libluajit.a lib
+	$(CP) $(ILUADIR)/libluajit.a lib
 
 IRRMAKEFLAGS=
 IRRMADELIB=
@@ -231,17 +232,17 @@ endif
 
 # Library - Irrlicht
 $(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a
-	cp $^ $@
+	$(CP) $^ $@
 
 $(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
 $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
 	@echo "Could not find $@, remaking..."
-	cp $^ $@
+	$(CP) $^ $@
 
 $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
-	cp $^ $@
+	$(CP) $^ $@
 
 $(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
@@ -249,23 +250,23 @@ $(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
 # Library - Lua
 # Client
 $(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
-	cp $^ $@
+	$(CP) $^ $@
 
 # Server
 $(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LLUADIR)/src/libluajit$(STA_LIB_EXT) : $(LLUADIR)/src/Makefile
-	cd $(LLUADIR)/src && make "BUILDMODE= static"
+	$(CP) $(LLUADIR)/src && make "BUILDMODE= static"
 
 $(LIB_S_LUA) : $(LLUADIR)/src/libluajit$(STA_LIB_EXT)
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LLUADIR)/src/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/Makefile
 	cd $(LLUADIR)/src && make "BUILDMODE= dynamic"
 
 $(LIB_D_LUA) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
-	cp $^ $@
+	$(CP) $^ $@
 
 # Library - Bullet
 $(LBULDIR)/lib/libBulletCollision.a : $(LBULDIR)/Makefile
@@ -278,13 +279,13 @@ $(LBULDIR)/lib/libLinearMath.a : $(LBULDIR)/Makefile
 	cd $(LBULDIR) && make LinearMath
 
 $(LIB_D_BCO) : $(LBULDIR)/lib/libBulletCollision.a
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LIB_D_BDY) : $(LBULDIR)/lib/libBulletDynamics.a
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LIB_D_BLM) : $(LBULDIR)/lib/libLinearMath.a
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt
 	cd $(LBULDIR) && cmake $(CMAKE_FLAGS) -DBUILD_EXTRAS=off -DBUILD_DEMOS=off
@@ -295,16 +296,16 @@ ifeq ($(DEBUG),true)
 	NNGCMAKEFLAGS += -DBUILD_SHARED_LIBS="TRUE"
 endif
 $(BIN_DIR)/$(CLIENTNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
-	cp $^ $@
+	$(CP) $^ $@
 
 $(BIN_DIR)/$(SERVERNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LIB_S_NNG) : $(LNNGDIR)/libnng.a
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LIB_D_NNG) : $(LNNGDIR)/libnng$(DYN_LIB_EXT)
-	cp $^ $@
+	$(CP) $^ $@
 
 $(LNNGDIR)/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/Makefile
 	cd $(LNNGDIR) && $(MAKE) nng
@@ -326,7 +327,7 @@ test: $(TEST_BINS)
 	@./busted busted.spec
 
 $(TEST_BINS) : test/bin/% : bin/client/bin/%
-	cp $^ $@
+	$(CP) $^ $@
 
 $(TEST_PATH)test_stream : $(TEST_SRC)test_streams.cpp $(SHARED_SRC)/lua_api/stream.cpp $(SHARED_SRC)/lua_api/stream.hpp
 	@$(CC) $(CFLAGS) -o $(TEST_PATH)test_stream $(TEST_SRC)test_streams.cpp $(SHARED_SRC)/lua_api/stream.cpp $(SHARED_SRC)/lua_api/stream.hpp
diff --git a/README.md b/README.md
index 8ea6a0a..f200dd3 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Binaries will not be provided until Brok[en]gine reaches version 1.0, if you wan
 
 1. Use [git](git-scm.com) to download this with submodules `git clone --recurse-submodules https://cogarr.net/source/cgi.cgit/brokengine` 
 2. Download make, g++, ect. Windows users can use [mingw](https://mingw.org). Open a terminal and cd into this folder, and run `make DEBUG=true`
+  1. For some god-awful reason, when useing MSYS2 under windows, you need to define MSYSTEM=MINGW64 as an environment variable to get luajit to compile. `set MSYSTEM=MINGW64`
 3. Binaries can be found in bin/(client|server)/bin/
 4. Initally ran scripts can be found at bin/(client|server)/data/init.lua