gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows MSVC fixes.

Browse source
This commit is contained in:
Frederik Seiffert 2021-02-08 21:39:14 +01:00 committed by Frederik Seiffert
parent 49fa0681af
commit 7ea6ab208d
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2021-02-12 Frederik Seiffert <frederik@algoriddim.com>
* common.make: Silence PATH warning on Windows MSVC.
* config-noarch.make.in: Add workaround for GNUSTEP_MAKEFILES
breaking when using Windows-native "make".
2021-01-29 Frederik Seiffert <frederik@algoriddim.com>
* common.make:

2
common.make
View file

@ -909,12 +909,14 @@ endif
ifneq ($(FOUNDATION_LIB), apple)
# Under Win32 paths are so confused this warning is not worthwhile
ifneq ($(findstring mingw, $(GNUSTEP_HOST_OS)), mingw)
ifneq ($(GNUSTEP_HOST_OS), windows)
ifeq ($(findstring $(GNUSTEP_SYSTEM_TOOLS),$(PATH)),)
$(warning WARNING: Your PATH may not be set up correctly !)
$(warning Please try again after adding "$(GNUSTEP_SYSTEM_TOOLS)" to your path)
endif
endif
endif
endif # code used when FOUNDATION_LIB != apple

20
config-noarch.make.in
View file

@ -85,9 +85,29 @@ else
GNUSTEP_USER_DIR = @GNUSTEP_USER_DIR@
endif
# When building using Windows-native "make", GNUSTEP_MAKEFILES can be a
# Windows-style path (with drive prefix and forward slashes), but
# including GNUSTEP_CONFIG_FILE below will turn it into a Unix-style
# path, breaking further uses of $GNUSTEP_MAKEFILES. As a hacky
# workaround we save the original path if it seems to be Windows-style
# (i.e. with drive letter prefix), and restore it below if needed.
ifeq ($(GNUSTEP_HOST_OS), windows)
ifeq ($(findstring :/, $(GNUSTEP_MAKEFILES)), :/)
ORIGINAL_GNUSTEP_MAKEFILES:=$(GNUSTEP_MAKEFILES)
endif
endif
# This includes the GNUstep configuration file, but only if it exists
-include $(GNUSTEP_CONFIG_FILE)
# Restore original GNUSTEP_MAKEFILES path to Windows-style path if new
# path is Unix-style.
ifneq ($(ORIGINAL_GNUSTEP_MAKEFILES),)
ifneq ($(findstring :/, $(GNUSTEP_MAKEFILES)), :/)
GNUSTEP_MAKEFILES:=$(ORIGINAL_GNUSTEP_MAKEFILES)
endif
endif
# FIXME: determining GNUSTEP_HOME
GNUSTEP_HOME = $(HOME)