diff --git a/NMakefile b/NMakefile index b9e4a933..f3fcce11 100644 --- a/NMakefile +++ b/NMakefile @@ -1,9 +1,13 @@ !include "win32/config.mk" +!include "Makefile.inc" + +OBJECTS=$(CSOURCES:.c=.obj) + # SUBDIRS=src example SUBDIRS=src -all-sub: +all-sub: win32\objects.mk -for %D in ($(SUBDIRS)) do $(MAKE) /nologo /f %D/NMakefile BUILD=$(BUILD) SUBDIR=%D all-sub clean: @@ -15,5 +19,10 @@ real-clean vclean: clean -del 2>NUL libssh2.ilk -del 2>NUL libssh2.lib -del 2>NUL *.pdb + -del 2>NUL win32\objects.mk +win32\objects.mk: Makefile.inc + @echo OBJECTS = \>$@ + @for %O in ($(OBJECTS)) do @echo $$(INTDIR)\%O \>>$@ + @echo $$(EOL)>>$@ diff --git a/src/NMakefile b/src/NMakefile old mode 100644 new mode 100755 index 2844eb83..faa39168 --- a/src/NMakefile +++ b/src/NMakefile @@ -1,29 +1,8 @@ !include "win32/config.mk" -CFLAGS=$(CFLAGS) +!include "win32/objects.mk" -OBJECTS = \ - $(INTDIR)\agent.obj \ - $(INTDIR)\channel.obj \ - $(INTDIR)\comp.obj \ - $(INTDIR)\crypt.obj \ - $(INTDIR)\global.obj \ - $(INTDIR)\hostkey.obj \ - $(INTDIR)\keepalive.obj \ - $(INTDIR)\kex.obj \ - $(INTDIR)\knownhost.obj \ - $(INTDIR)\mac.obj \ - $(INTDIR)\misc.obj \ - $(INTDIR)\openssl.obj \ - $(INTDIR)\packet.obj \ - $(INTDIR)\pem.obj \ - $(INTDIR)\publickey.obj \ - $(INTDIR)\scp.obj \ - $(INTDIR)\session.obj \ - $(INTDIR)\sftp.obj \ - $(INTDIR)\transport.obj \ - $(INTDIR)\userauth.obj \ - $(INTDIR)\version.obj +CFLAGS=$(CFLAGS) RESOURCE=$(INTDIR)\libssh2.res