Mercurial > pub > dyncall > dyncall

diff buildsys/nmake/prolog.nmake @ 632:ed19b429a152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- added explicit arm64 target, and clang tool options to Windows' configure.bat - configure.{bat,rc} now writing Makefile.config, for consistency/compatibility (e.g. configure.bat can now be used to set up env flags for a non-nmake toolchain) - simplified/decluttered Windows and Plan9 configure scripts (removal of unused/stale options, ...) - removed stale test/makepkg.sh helper
author Tassilo Philipp
date Sat, 19 Nov 2022 15:45:41 +0100
parents 3e629dc19168
children
line wrap: on
line diff
--- a/buildsys/nmake/prolog.nmake	Wed Nov 09 14:46:38 2022 +0100
+++ b/buildsys/nmake/prolog.nmake	Sat Nov 19 15:45:41 2022 +0100
@@ -1,7 +1,7 @@
 #//////////////////////////////////////////////////////////////////////////////
 #
-# Copyright (c) 2007,2009 Daniel Adler <dadler@uni-goettingen.de>, 
-#                         Tassilo Philipp <tphilipp@potion-studios.com>
+# Copyright (c) 2007,2009      Daniel Adler <dadler@uni-goettingen.de>, 
+#               2007,2009,2022 Tassilo Philipp <tphilipp@potion-studios.com>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -33,8 +33,8 @@
 
 # Check if library has been 'configured' properly. If not, tell the user and abort.
 !IF !DEFINED(CONFIG_OS) || !DEFINED(CONFIG_ARCH)
-configure: $(TOP)\ConfigVars
-$(TOP)\ConfigVars:
+configure: $(TOP)\Makefile.config
+$(TOP)\Makefile.config:
 	echo "Library not configured properly! Run configure.bat from the library's root directory first!"
 !ELSE
 configure:
@@ -42,14 +42,10 @@
 
 
 # Include config rules.
-!IF EXISTS($(TOP)\ConfigVars)
-!  INCLUDE $(TOP)\ConfigVars
+!IF EXISTS($(TOP)\Makefile.config)
+!  INCLUDE $(TOP)\Makefile.config
 !ENDIF
 
-# Include site rules.
-!IF EXISTS($(TOP)\SiteVars)
-!  INCLUDE $(TOP)\SiteVars
-!ENDIF
 
 # set BUILD_* from CONFIG_* variables
 !IF !DEFINED(BUILD_HOST)
@@ -67,9 +63,6 @@
 !IF !DEFINED(BUILD_ASM)
 BUILD_ASM = $(CONFIG_ASM)
 !ENDIF
-!IF !DEFINED(BUILD_CONFIG)
-BUILD_CONFIG = $(CONFIG_CONFIG)
-!ENDIF
 
 !IF "$(BUILD_TOOL)" != ""
 !  INCLUDE tool_$(BUILD_TOOL).nmake