diff --git a/nmake/Makefile.am b/nmake/Makefile.am index bdcd4dd..51d32e9 100644 --- a/nmake/Makefile.am +++ b/nmake/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST = \ + create-lists-msvc.mak \ detectenv-msvc.mak \ Makefile.vc \ config.h.win32 diff --git a/nmake/Makefile.vc b/nmake/Makefile.vc index e62d3ae..eaf4ab1 100644 --- a/nmake/Makefile.vc +++ b/nmake/Makefile.vc @@ -50,23 +50,7 @@ LDFLAGS = $(LDFLAGS_BASE) /opt:ref /LTCG !endif !include ..\Makefile.sources - -# Convert the source (*.c) listing to object (.obj) listing in -# another NMake Makefile module, include it, and clean it up. - -!if [echo pkg_config_OBJS = \> objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] -!endif - -!if [for %c in ($(pkg_config_SOURCES)) do @if "%~xc" == ".c" echo. vs^$(VSVER)\^$(CFG)\^$(PLAT)\pkg-config\%~nc.obj \>> objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] -!endif - -!if [echo. ^$(NULL)>> objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] -!endif - -!include objs_vs$(VSVER)_$(PLAT)_$(CFG).mak - -!if [del /f /q objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] -!endif +!include create-lists-msvc.mak pkg_config_LIBS = glib-2.0.lib diff --git a/nmake/create-lists-msvc.mak b/nmake/create-lists-msvc.mak new file mode 100644 index 0000000..8658465 --- /dev/null +++ b/nmake/create-lists-msvc.mak @@ -0,0 +1,16 @@ +# Convert the source (*.c) listing to object (.obj) listing in +# another NMake Makefile module, include it, and clean it up. + +!if [echo pkg_config_OBJS = \> objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] +!endif + +!if [for %c in ($(pkg_config_SOURCES)) do @if "%~xc" == ".c" echo. vs^$(VSVER)\^$(CFG)\^$(PLAT)\pkg-config\%~nc.obj \>> objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] +!endif + +!if [echo. ^$(NULL)>> objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] +!endif + +!include objs_vs$(VSVER)_$(PLAT)_$(CFG).mak + +!if [del /f /q objs_vs$(VSVER)_$(PLAT)_$(CFG).mak] +!endif \ No newline at end of file