win32: build-tcc.bat: get rid of hardcoded VERSION string

grischka committed 13 years ago

Commit b1743991 parent 3f09b902 files · +7 −11Browse files

Unified · Split

2 files

 @rem ----------------------------------------------------
-@rem batch file to build tcc using gcc and ar from mingw
+@rem batch file to build tcc using mingw gcc
 @rem ----------------------------------------------------
-echo>..\config.h #define TCC_VERSION "0.9.25"
+@set /p VERSION= < ..\VERSION
+echo>..\config.h #define TCC_VERSION "%VERSION%"
 @if _%PROCESSOR_ARCHITEW6432%_==_AMD64_ goto x86_64
 @if _%PROCESSOR_ARCHITECTURE%_==_AMD64_ goto x86_64
 @set target=-DTCC_TARGET_PE -DTCC_TARGET_I386
 @set CC=gcc -Os -s -fno-strict-aliasing
-@set AR=ar
 @set P=32
 @goto tools
 @set target=-DTCC_TARGET_PE -DTCC_TARGET_X86_64
 @rem mingw 64 has an ICE with -Os
 @set CC=x86_64-pc-mingw32-gcc -O0 -s -fno-strict-aliasing
-@set AR=x86_64-pc-mingw32-ar
 @set P=64
+@goto tools
 :tools
 %CC% %target% tools/tiny_impdef.c -o tiny_impdef.exe
 if not exist libtcc\nul mkdir libtcc
 copy ..\libtcc.h libtcc\libtcc.h
 %CC% %target% -shared -DLIBTCC_AS_DLL -DONE_SOURCE ../libtcc.c -o libtcc.dll -Wl,-out-implib,libtcc/libtcc.a
-tiny_impdef libtcc.dll -o lib/libtcc.def
+tiny_impdef libtcc.dll -o libtcc/libtcc.def
 :tcc
 %CC% %target% ../tcc.c -o tcc.exe -ltcc -Llibtcc
 .\tcc %target% -c lib/dllcrt1.c
 .\tcc %target% -c lib/dllmain.c
 .\tcc %target% -c lib/chkstk.S
-@if _%P%_==_64_ goto lib64
+goto lib%P%
 :lib32
 .\tcc %target% -c ../lib/alloca86.S
 :the_end
 del *.o
-:libtcc_test
-.\tcc -v -I libtcc -ltcc ../tests/libtcc_test.c
-.\libtcc_test

@@ -64,7 +64,7 @@ · 63 unmodified lines
64		64
65	For the 'libtcc_test' example type	65	For the 'libtcc_test' example type
66		66
67	tcc examples/libtcc_test.c -I libtcc -ltcc	67	tcc examples/libtcc_test.c -I libtcc -L libtcc -ltcc
68		68
69		69
70	Import Definition Files:	70	Import Definition Files:

Keyboard shortcuts