Completed merge, everything should build under windows now.

1 files changed, 38 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index b7b693a..a019bcd 100644
--- a/Makefile
+++ b/Makefile
@@ -214,27 +214,29 @@ $(LIBLUA) : $(ILUADIR)/Makefile
 
 IRRMAKEFLAGS=
 IRRMADELIB=
-ifeq ($(DEBUG),true)
-	IRRMAKEFLAGS+=NDEBUG=1
-endif
 ifeq ($(UNAME), Windows)
 	ifeq ($(DEBUG),true)
-		IRRMAKEFLAGS+=dynamiclib_win32
+		IRRMAKEFLAGS=sharedlib_win32
 		IRRMADELIB=$(LIRRDIR)/bin/Win32-gcc
 	else
 		IRRMAKEFLAGS=staticlib_win32
 		IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc
 	endif
-	IRRMAKEFLAGS+=-DNO_IRR_COMPILE_WITH_DIRECT3D_9_
 else
 	IRRMADELIB=$(LIRRDIR)/lib/Linux
 endif
 
+ifeq ($(DEBUG),true)
+else
+	IRRMAKEFLAGS+=NDEBUG=1
+endif
+
 # Library - Irrlicht
 $(LIB_S_IRR) : $(IRRMADELIB)/libIrrlicht.a
 	$(CP) $^ $@
 
 $(IRRMADELIB)/libIrrlicht.a : $(LIRRDIR)/source/Irrlicht/Makefile
+	sed --in-place=OLD '107s/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
 $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
@@ -244,9 +246,16 @@ $(LIB_D_IRR) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
 $(BIN_DIR)/$(CLIENTNAME)/bin/Irrlicht$(DYN_LIB_EXT) : $(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT)
 	$(CP) $^ $@
 
-$(IRRMADELIB)/lib/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
+$(IRRMADELIB)/Irrlicht$(DYN_LIB_EXT) : $(LIRRDIR)/source/Irrlicht/Makefile
+	sed --in-place=OLD '107s/ -ld3dx9d//' lib/irrlicht/source/Irrlicht/Makefile
 	cd $(LIRRDIR)/source/Irrlicht && $(MAKE) $(IRRMAKEFLAGS)
 
+ifeq ($(UNAME),Windows)
+	LUAJIT_ARGS:= TARGET_SYS=Windows
+else
+	LUAJIT_ARGS:=
+endif
+
 # Library - Lua
 # Client
 $(BIN_DIR)/$(CLIENTNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
@@ -257,26 +266,30 @@ $(BIN_DIR)/$(SERVERNAME)/bin/lua51$(DYN_LIB_EXT) : $(LIB_D_LUA)
 	$(CP) $^ $@
 
 $(LLUADIR)/src/libluajit$(STA_LIB_EXT) : $(LLUADIR)/src/Makefile
+<<<<<<< HEAD
 	$(CP) $(LLUADIR)/src && make "BUILDMODE= static"
+=======
+	cd $(LLUADIR)/src && $(MAKE) $(LUAJIT_ARGS) "BUILDMODE= static"
+>>>>>>> 3623bc70af309d1823c664a8129956da6c0e9c4a
 
 $(LIB_S_LUA) : $(LLUADIR)/src/libluajit$(STA_LIB_EXT)
 	$(CP) $^ $@
 
 $(LLUADIR)/src/lua51$(DYN_LIB_EXT) : $(LLUADIR)/src/Makefile
-	cd $(LLUADIR)/src && make "BUILDMODE= dynamic"
+	cd $(LLUADIR)/src && $(MAKE) $(LUAJIT_ARGS) "BUILDMODE= dynamic"
 
 $(LIB_D_LUA) : $(LLUADIR)/src/lua51$(DYN_LIB_EXT)
 	$(CP) $^ $@
 
 # Library - Bullet
 $(LBULDIR)/lib/libBulletCollision.a : $(LBULDIR)/Makefile
-	cd $(LBULDIR) && make BulletCollision
+	cd $(LBULDIR) && $(MAKE) BulletCollision
 
 $(LBULDIR)/lib/libBulletDynamics.a : $(LBULDIR)/Makefile
-	cd $(LBULDIR) && make BulletDynamics
+	cd $(LBULDIR) && $(MAKE) BulletDynamics
 
 $(LBULDIR)/lib/libLinearMath.a : $(LBULDIR)/Makefile
-	cd $(LBULDIR) && make LinearMath
+	cd $(LBULDIR) && $(MAKE) LinearMath
 
 $(LIB_D_BCO) : $(LBULDIR)/lib/libBulletCollision.a
 	$(CP) $^ $@
@@ -292,23 +305,29 @@ $(LBULDIR)/Makefile : $(LBULDIR)/CMakeLists.txt
 
 # Library - NNG
 NNGFLAGS=
-ifeq ($(DEBUG),true)
-	NNGCMAKEFLAGS += -DBUILD_SHARED_LIBS="TRUE"
-endif
 $(BIN_DIR)/$(CLIENTNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
 	$(CP) $^ $@
 
 $(BIN_DIR)/$(SERVERNAME)/bin/libnng$(DYN_LIB_EXT) : $(LIB_D_NNG)
 	$(CP) $^ $@
 
-$(LIB_S_NNG) : $(LNNGDIR)/libnng.a
-	$(CP) $^ $@
+$(LNNGDIR)/dynamic : $(LNNGDIR)/CMakeLists.txt
+	mkdir $@
 
-$(LIB_D_NNG) : $(LNNGDIR)/libnng$(DYN_LIB_EXT)
-	$(CP) $^ $@
+$(LNNGDIR)/dynamic/Makefile : $(LNNGDIR)/dynamic
+	cd $< && cmake $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS="TRUE" ../
+
+$(LIB_S_NNG) : $(LNNGDIR)/static/libnng$(STA_LIB_EXT) $(LNNGDIR)/static
+	cp $< $@
+
+$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) $(LNNGDIR)/dynamic
+	cp $< $@
+
+$(LNNGDIR)/static/libnng$(STA_LIB_EXT) : $(LNNGDIR)/static $(LNNGDIR)/static/Makefile
+	cd $(LNNGDIR)/static && $(MAKE) nng
 
-$(LNNGDIR)/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/Makefile
-	cd $(LNNGDIR) && $(MAKE) nng
+$(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic $(LNNGDIR)/dynamic/Makefile
+	cd $(LNNGDIR)/dynamic && $(MAKE) nng
 
 $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt
 	@echo "LIB_OBJS were $(LIB_OBJS)"