paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 03:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes: added cocoa linker options

Browse Source
This commit is contained in:
mattias 2024-07-18 09:58:39 +02:00
parent 8de9d44d69
commit d703eb5231
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/chmhelp/lhelp/Makefile
View File

@ -385,6 +385,9 @@ endif
endif
endif
export LCL_PLATFORM
ifeq ($(LCL_PLATFORM),cocoa)
LHELP_OPT+=-k-framework -kCocoa -k-weak_framework -kUserNotifications
endif
ifneq ($(findstring $(OS_TARGET),win32 win64),)
LHELP_OPT+= -WG
endif

4
components/chmhelp/lhelp/Makefile.fpc
View File

@ -49,6 +49,10 @@ endif
endif
export LCL_PLATFORM
ifeq ($(LCL_PLATFORM),cocoa)
LHELP_OPT+=-k-framework -kCocoa -k-weak_framework -kUserNotifications
endif
# apptype gui
ifneq ($(findstring $(OS_TARGET),win32 win64),)
LHELP_OPT+= -WG

9
ide/Makefile
View File

@ -388,7 +388,10 @@ ifeq ($(OS_TARGET),darwin)
DBG_OPTIONS=-gw
endif
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
ifeq ($(LCL_PLATFORM),cocoa)
LAZARUS_OPT+=-k-framework -kCocoa -k-weak_framework -kUserNotifications
endif
DEFAULT_IDE_OPTIONS= \
-Fu../packager/units/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) \
@ -4801,11 +4804,11 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)'
bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(BIG_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)'
starter: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=startlazarus.lpr startlazarus$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)'
lazbuilder: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(OPT)'
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZBUILD_OPT) $(OPT)'
all: ide starter lazbuilder
cleanide:
-$(DEL) $(wildcard *$(OEXT))

10
ide/Makefile.fpc
View File

@ -78,12 +78,14 @@ DBG_OPTIONS=-gw
endif
#
# idemake.cfg
LAZARUS_OPT=$(LAZARUS_LIBPATHS)
ifeq ($(LCL_PLATFORM),cocoa)
LAZARUS_OPT+=-k-framework -kCocoa -k-weak_framework -kUserNotifications
endif
#
# Options to compile an IDE without extra packages
DEFAULT_IDE_OPTIONS= $(LAZARUS_LIBPATHS) \
DEFAULT_IDE_OPTIONS= \
-Fu../packager/units/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/codetools/units/$(CPU_TARGET)-$(OS_TARGET) \
-Fu../components/debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET) \
@ -185,7 +187,7 @@ ide: $(COMPILER_UNITTARGETDIR) revisioninc
# compile IDE with some extra packages
bigide: $(COMPILER_UNITTARGETDIR) revisioninc
-$(DEL) $(COMPILER_UNITTARGETDIR)/pkgmanager$(PPUEXT)
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(BIG_IDE_OPTIONS)'
$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(BIG_IDE_OPTIONS) $(LAZARUS_OPT) $(OPT)'
#-----------------------------------------------------------------------------
starter: $(COMPILER_UNITTARGETDIR)
@ -193,7 +195,7 @@ starter: $(COMPILER_UNITTARGETDIR)
#-----------------------------------------------------------------------------
lazbuilder: $(COMPILER_UNITTARGETDIR)
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(OPT)'
$(MAKE) --assume-new=lazbuild.lpr lazbuild$(EXEEXT) OPT='$(DEFAULT_IDE_OPTIONS) $(LAZBUILD_OPT) $(OPT)'
#-----------------------------------------------------------------------------
all: ide starter lazbuilder