# HG changeset patch # User Tassilo Philipp # Date 1668978879 -3600 # Node ID 840a870c093c1e2ef50eb6212b6ed225a5d24452 # Parent e3441521ad6b873ec94201d02d8dd822211b467a - add flag to configure.bat to generate *nix makefiles (can be used to gen a mostly working *nix make build env run with batch, not logical but useful in some zombie setups) diff -r e3441521ad6b -r 840a870c093c configure.bat --- a/configure.bat Sun Nov 20 19:46:01 2022 +0100 +++ b/configure.bat Sun Nov 20 22:14:39 2022 +0100 @@ -36,6 +36,7 @@ ) ELSE ( SET CONFIG_ARCH=x86 ) +SET CONFIG_MAKE=nmake REM Scan arguments. :MAIN_LOOP @@ -67,6 +68,9 @@ ECHO. /asm-ml use Microsoft Macro Assembler ^(default^) ECHO. /asm-as use the GNU or LLVM Assembler ECHO. /asm-nasm use NASM Assembler + ECHO. + ECHO. /make-nmake configure for use with cmd.exe/NMAKE env ^(default^) + ECHO. /make-make configure for use with sh/make env GOTO:EOF ) ELSE IF [%1]==[/target-x86] ( SET CONFIG_ARCH=x86 @@ -98,6 +102,8 @@ SET CONFIG_ASM=nasm ) ELSE IF [%1]==[/asm-ml] ( SET CONFIG_ASM=ml +) ELSE IF [%1]==[/make-make] ( + SET CONFIG_MAKE=make ) ELSE ( ECHO Unknown parameter '%1'. GOTO DONE @@ -114,6 +120,7 @@ ECHO CONFIG_ARCH=%CONFIG_ARCH%#>>Makefile.config ECHO CONFIG_TOOL=%CONFIG_TOOL%#>>Makefile.config ECHO CONFIG_ASM=%CONFIG_ASM%#>>Makefile.config +ECHO CONFIG_MAKE=%CONFIG_MAKE%#>>Makefile.config ECHO Writing following configuration to Makefile.config: ECHO. @@ -122,6 +129,7 @@ ECHO Target Architecture: %CONFIG_ARCH% ECHO Compiler: %CONFIG_TOOL% ECHO Assembler: %CONFIG_ASM% +ECHO Make: %CONFIG_MAKE% REM We have to transform some pathes for the nds/devkitPro build. @@ -134,3 +142,14 @@ ) ) +REM Generate *nix style make files? @@@ maybe we should just always do that +IF [%CONFIG_MAKE%]==[make] ( + FOR /F "USEBACKQ TOKENS=*" %%X IN (`CD`) DO ( + FOR /R %%F IN (Makefile.generic) DO IF EXIST %%F ( + ECHO VPATH = %%~dF%%~pF.>%%~pF%%~nF + ECHO include %%X\Makefile.config>>%%~pF%%~nF + ECHO include ${VPATH}\Makefile.generic>>%%~pF%%~nF + ) + ) +) +