Mercurial > pub > dyncall > dyncall
diff buildsys/nmake/tool_gcc.nmake @ 632:ed19b429a152
- 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/tool_gcc.nmake Wed Nov 09 14:46:38 2022 +0100 +++ b/buildsys/nmake/tool_gcc.nmake Sat Nov 19 15:45:41 2022 +0100 @@ -1,6 +1,6 @@ #////////////////////////////////////////////////////////////////////////////// # -# Copyright (c) 2007,2009 Daniel Adler <dadler@uni-goettingen.de>, +# Copyright (c) 2007-2022 Daniel Adler <dadler@uni-goettingen.de>, # Tassilo Philipp <tphilipp@potion-studios.com> # # Permission to use, copy, modify, and distribute this software for any @@ -25,6 +25,16 @@ #/////////////////////////////////////////////////// +CC =gcc +CXX =g++ +AR =ar +AS =as +LD =g++#ld +OCP =objcopy + + +!IF "$(BUILD_OS)" == "nds" + CC =arm-eabi-gcc CXX =arm-eabi-g++ AR =arm-eabi-ar @@ -34,27 +44,26 @@ !IF "$(BUILD_ARCH)" == "arm32_thumb" -ASFLAGS = -g -mthumb -mthumb-interwork -CFLAGS = -g -Wall -O2 -I$(TOP)\dyncall -I$(TOP)\dyncallback -fomit-frame-pointer -ffast-math -fno-strict-aliasing -mthumb -mthumb-interwork +ASFLAGS = -mthumb -mthumb-interwork +CFLAGS = -Wall -O2 -I$(TOP)\dyncall -I$(TOP)\dyncallback -fomit-frame-pointer -ffast-math -fno-strict-aliasing -mthumb -mthumb-interwork CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -LDFLAGS = -g -mno-fpu -mthumb -mthumb-interwork +LDFLAGS = -mno-fpu -mthumb -mthumb-interwork ARFLAGS = !ELSE IF "$(BUILD_ARCH)" == "arm32_arm" -ASFLAGS = -g -CFLAGS = -g -Wall -O2 -I$(TOP)\dyncall -I$(TOP)\dyncallback -fomit-frame-pointer -ffast-math -fno-strict-aliasing +ASFLAGS = +CFLAGS = -Wall -O2 -I$(TOP)\dyncall -I$(TOP)\dyncallback -fomit-frame-pointer -ffast-math -fno-strict-aliasing CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions -LDFLAGS = -g -mno-fpu +LDFLAGS = -mno-fpu ARFLAGS = !ENDIF - -!IF "$(BUILD_OS)" == "nds" CFLAGS = $(CFLAGS) -DARM9 -mcpu=arm9tdmi -mtune=arm9tdmi -D__nds__ -I"$(DEVKITPRO_PATH)/libnds/include" CXXFLAGS = $(CXXFLAGS) -D__nds__ -I"$(DEVKITPRO_PATH)/libnds/include" LDFLAGS = $(LDFLAGS) -specs=ds_arm9.specs + !ENDIF @@ -80,3 +89,4 @@ .tex.pdf: pdflatex $< +