mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-31 01:30:47 +00:00
Merge branch 'master' of github.com:gnustep/libs-gui into NSFontCollection_branch
This commit is contained in:
commit
16963fa2ab
2 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
2020-03-12 Sergii Stoian <stoyan255@gmail.com>
|
||||
|
||||
* Model/GNUmakefile: do not overwrite ADDITIONAL_INCLUDE_DIRS
|
||||
value to help RPM build. In spec file ADDITIONAL_INCLUDE_DIRS can be sat
|
||||
to subdirectories which are create by RPM build tool.
|
||||
|
||||
2020-03-05 Sergii Stoian <stoyan255@gmail.com>
|
||||
|
||||
* Source/NSWindow.m (_applyFrame:): new helper method to do actual
|
||||
|
|
|
@ -66,9 +66,9 @@ ADDITIONAL_CPPFLAGS += $(RUNTIME_DEFINE) $(GUI_DEFINE) $(BACKEND_DEFINE)
|
|||
ADDITIONAL_LIB_DIRS += -L$(GNUSTEP_OBJ_DIR)
|
||||
ifeq ($(GUI_LIB), gnu)
|
||||
ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR)
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions -I../Headers
|
||||
ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions -I../Headers
|
||||
else
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions
|
||||
ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions
|
||||
endif
|
||||
|
||||
ADDITIONAL_OBJC_FLAGS += $(BACKEND_DEFINE)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue