diff options
| -rw-r--r-- | .gitmodules | 10 | ||||
| -rw-r--r-- | Makefile | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules index 86d0d15..adc017d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,16 @@ [submodule "lib/bullet"] path = lib/bullet - url = https://gitlab.com/bbblitz/bullet3/ + url = https://cogarr.net/source/cgit.cgi/bullet3/ branch = master [submodule "lib/irrlicht"] path = lib/irrlicht - url = https://gitlab.com/bbblitz/irrlicht/ + url = https://cogarr.net/source/cgit.cgi/irrlicht/ [submodule "lib/luajit"] path = lib/luajit - url = https://gitlab.com/bbblitz/luajit/ + url = https://cogarr.net/source/cgit.cgi/luajit/ [submodule "lib/tinyobjloader-c"] path = lib/tinyobjloader-c - url = http://cogarr.net/source/cgit.cgi/tinyobjloader-c/ + url = https://cogarr.net/source/cgit.cgi/tinyobjloader-c/ [submodule "lib/nng"] path = lib/nng - url = http://cogarr.net/source/cgit.cgi/nng/ + url = https://cogarr.net/source/cgit.cgi/nng/ @@ -221,7 +221,6 @@ ifeq ($(UNAME), Windows) IRRMAKEFLAGS=staticlib_win32 IRRMADELIB=$(LIRRDIR)/lib/Win32-gcc endif - IRRMAKEFLAGS+=-DNO_IRR_COMPILE_WITH_DIRECT3D_9_ else IRRMADELIB=$(LIRRDIR)/lib/Linux endif @@ -314,16 +313,16 @@ $(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 $^ $@ + cp $< $@ -$(LIB_D_NNG) : $(LNNGDIR)/dynamic/libnng$(DYN_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 - $(LNNGDIR)/static/Makefile + cd $(LNNGDIR)/static && $(MAKE) nng $(LNNGDIR)/dynamic/libnng$(DYN_LIB_EXT) : $(LNNGDIR)/dynamic $(LNNGDIR)/dynamic/Makefile - $(LNNGDIR)/dynamic/Makefile + cd $(LNNGDIR)/dynamic && $(MAKE) nng $(LNNGDIR)/Makefile : $(LNNGDIR)/CMakeLists.txt @echo "LIB_OBJS were $(LIB_OBJS)" |