Mercurial > pub > dyncall > dyncall

diff configure.bat @ 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 f5e9f7f8a932
children 840a870c093c
line wrap: on
line diff
--- a/configure.bat	Wed Nov 09 14:46:38 2022 +0100
+++ b/configure.bat	Sat Nov 19 15:45:41 2022 +0100
@@ -1,7 +1,7 @@
 @ECHO OFF
 REM ///////////////////////////////////////////////////////////////////////////
 REM
-REM Copyright (c) 2007-2009 Daniel Adler <dadler@uni-goettingen.de>, 
+REM Copyright (c) 2007-2022 Daniel Adler <dadler@uni-goettingen.de>,
 REM                         Tassilo Philipp <tphilipp@potion-studios.com>
 REM
 REM Permission to use, copy, modify, and distribute this software for any
@@ -27,11 +27,12 @@
 SET CONFIG_OS=windows
 SET CONFIG_TOOL=msvc
 SET CONFIG_ASM=ml
-SET CONFIG_CONFIG=release
 IF [%PROCESSOR_ARCHITECTURE%] == [AMD64] (
 	SET CONFIG_ARCH=x64
 ) ELSE IF [%PROCESSOR_ARCHITEW6432%] == [AMD64] (
 	SET CONFIG_ARCH=x64
+) ELSE IF [%PROCESSOR_ARCHITECTURE%] == [ARM64] (
+	SET CONFIG_ARCH=arm64
 ) ELSE (
 	SET CONFIG_ARCH=x86
 )
@@ -52,36 +53,27 @@
 	ECHO.Options:
 	ECHO.  /?                print this page
 	ECHO.
-	ECHO.  /prefix PATH      set installation prefix ^(GNU make only^)
-	ECHO.  /prefix-bd PATH   set build directory prefix ^(GNU make only^)
-	ECHO.                    ^(only for use with gmake^)
-	ECHO.
 	ECHO.  /target-x86       build for x86 architecture
 	ECHO.  /target-x64       build for x64 architecture
-	ECHO.  /target-psp       build for PlayStation Portable ^(homebrew SDK^)
-	ECHO.  /target-nds-arm   build for Nintendo DS ^(devkitPro, ARM mode^)
-	ECHO.  /target-nds-thumb build for Nintendo DS ^(devkitPro, THUMB mode^)
+	ECHO.  /target-arm64     build for arm64 architecture
+	ECHO.  /target-psp       cross-build for PlayStation Portable ^(homebrew SDK^)
+	ECHO.  /target-nds-arm   cross-build for Nintendo DS ^(devkitPro, ARM mode^)
+	ECHO.  /target-nds-thumb cross-build for Nintendo DS ^(devkitPro, THUMB mode^)
 	ECHO.
 	ECHO.  /tool-msvc        use Microsoft Visual C++ compiler ^(default^)
 	ECHO.  /tool-gcc         use GNU Compiler Collection
+	ECHO.  /tool-clang       use LLVM clang compiler
 	ECHO.
 	ECHO.  /asm-ml           use Microsoft Macro Assembler ^(default^)
-	ECHO.  /asm-as           use the GNU Assembler
+	ECHO.  /asm-as           use the GNU or LLVM Assembler
 	ECHO.  /asm-nasm         use NASM Assembler
-	ECHO.
-	ECHO.  /config-release   build release version ^(default^)
-	ECHO.  /config-debug     build debug version
 	GOTO:EOF
-) ELSE IF [%1]==[/prefix] (
-	SET CONFIG_PREFIX=%2
-	SHIFT
-) ELSE IF [%1]==[/prefix-bd] (
-	SET CONFIG_BUILDPREFIX=%2
-	SHIFT
 ) ELSE IF [%1]==[/target-x86] (
 	SET CONFIG_ARCH=x86
 ) ELSE IF [%1]==[/target-x64] (
 	SET CONFIG_ARCH=x64
+) ELSE IF [%1]==[/target-arm64] (
+	SET CONFIG_ARCH=arm64
 ) ELSE IF [%1]==[/target-psp] (
 	SET CONFIG_ARCH=mips32
 	SET CONFIG_OS=psp
@@ -97,16 +89,15 @@
 ) ELSE IF [%1]==[/tool-msvc] (
 	SET CONFIG_TOOL=msvc
 	SET CONFIG_ASM=ml
+) ELSE IF [%1]==[/tool-clang] (
+	SET CONFIG_TOOL=clang
+	SET CONFIG_ASM=as
 ) ELSE IF [%1]==[/asm-as] (
 	SET CONFIG_ASM=as
 ) ELSE IF [%1]==[/asm-nasm] (
 	SET CONFIG_ASM=nasm
 ) ELSE IF [%1]==[/asm-ml] (
 	SET CONFIG_ASM=ml
-) ELSE IF [%1]==[/config-release] (
-	SET CONFIG_CONFIG=release
-) ELSE IF [%1]==[/config-debug] (
-	SET CONFIG_CONFIG=debug
 ) ELSE (
 	ECHO Unknown parameter '%1'.
 	GOTO DONE
@@ -116,34 +107,21 @@
 GOTO MAIN_LOOP
 :DONE
 
-IF [%CONFIG_PREFIX%]==[] (
-	SET CONFIG_PREFIX=%CD%\install_%CONFIG_OS%_%CONFIG_ARCH%_%CONFIG_TOOL%_%CONFIG_CONFIG%
-)
-IF [%CONFIG_BUILDPREFIX%]==[] (
-	SET CONFIG_BUILDPREFIX=%CD%\build_out\%CONFIG_OS%_%CONFIG_ARCH%_%CONFIG_TOOL%_%CONFIG_CONFIG%
-)
+ECHO # auto-generated by configure.bat >Makefile.config
+ECHO CONFIG_PACKAGE=%PACKAGE%#>>Makefile.config
+ECHO CONFIG_HOST=%CONFIG_HOST%#>>Makefile.config
+ECHO CONFIG_OS=%CONFIG_OS%#>>Makefile.config
+ECHO CONFIG_ARCH=%CONFIG_ARCH%#>>Makefile.config
+ECHO CONFIG_TOOL=%CONFIG_TOOL%#>>Makefile.config
+ECHO CONFIG_ASM=%CONFIG_ASM%#>>Makefile.config
 
-ECHO # auto-generated by configure.bat >ConfigVars
-ECHO CONFIG_PACKAGE=%PACKAGE%#>>ConfigVars
-ECHO CONFIG_HOST=%CONFIG_HOST%#>>ConfigVars
-ECHO CONFIG_OS=%CONFIG_OS%#>>ConfigVars
-ECHO CONFIG_ARCH=%CONFIG_ARCH%#>>ConfigVars
-ECHO CONFIG_TOOL=%CONFIG_TOOL%#>>ConfigVars
-ECHO CONFIG_ASM=%CONFIG_ASM%#>>ConfigVars
-ECHO CONFIG_CONFIG=%CONFIG_CONFIG%#>>ConfigVars
-ECHO CONFIG_PREFIX=%CONFIG_PREFIX%#>>ConfigVars
-ECHO CONFIG_BUILDPREFIX=%CONFIG_BUILDPREFIX%#>>ConfigVars
-
-ECHO Writing following configuration to ConfigVars:
+ECHO Writing following configuration to Makefile.config:
 ECHO.
 ECHO Host OS:             %CONFIG_HOST%
 ECHO Target OS:           %CONFIG_OS%
 ECHO Target Architecture: %CONFIG_ARCH%
 ECHO Compiler:            %CONFIG_TOOL%
 ECHO Assembler:           %CONFIG_ASM%
-ECHO Build configuration: %CONFIG_CONFIG%
-ECHO Install prefix:      %CONFIG_PREFIX%
-ECHO Build prefix:        %CONFIG_BUILDPREFIX%
 
 
 REM We have to transform some pathes for the nds/devkitPro build.
@@ -155,3 +133,4 @@
 		buildsys\scripts\conf-nds.bat
 	)
 )
+