gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-22 19:21:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update GNUmakefiles to correct compilation issues on WIN32

Browse source
This commit is contained in:
Gregory Casamento 2023-10-22 09:50:49 -04:00
parent eda97765d2
commit 98807d5272
6 changed files with 49 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
GNUmakefile
View file

@ -54,9 +54,9 @@ SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/apps
#
SUBPROJECTS = \
InterfaceBuilder \
GormObjCHeaderParser \
GormCore \
Plugins \
GormObjCHeaderParser \
Applications \
Tools

20
GormCore/GNUmakefile.preamble
View file

@ -22,11 +22,19 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
ADDITIONAL_INCLUDE_DIRS += \
-I../InterfaceBuilder
ADDITIONAL_INCLUDE_DIRS += -I../..
# ADDITIONAL_GUI_LIBS += \
# -lInterfaceBuilder
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
#ADDITIONAL_LIB_DIRS += \
# -L../InterfaceBuilder/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormObjCHeaderParser
endif
ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormObjCHeaderParser
endif

18
Plugins/GModel/GNUmakefile.preamble
View file

@ -1,19 +1,19 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../../..
ADDITIONAL_INCLUDE_DIRS += -I../../
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
endif
ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
endif

18
Plugins/Gorm/GNUmakefile.preamble
View file

@ -1,19 +1,19 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../../..
ADDITIONAL_INCLUDE_DIRS += -I../../
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
endif
ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
endif

18
Plugins/Nib/GNUmakefile.preamble
View file

@ -1,19 +1,19 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../../..
ADDITIONAL_INCLUDE_DIRS += -I../../
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
endif
ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/$(GNUSTEP_OBJ_DIR)
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
endif

14
Plugins/Xib/GNUmakefile.preamble
View file

@ -1,19 +1,19 @@
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../../.. -I../.. -I.. -I../GormCore
ADDITIONAL_INCLUDE_DIRS += -I../../
ifeq ($(GNUSTEP_TARGET_OS),mingw32)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/InterfaceBuilder.framework \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework \
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
ADDITIONAL_GUI_LIBS += -lInterfaceBuilder -lGormCore
endif
ifeq ($(GNUSTEP_TARGET_OS),cygwin)
ADDITIONAL_LIB_DIRS += \
-L../../../InterfaceBuilder/InterfaceBuilder.framework \
-L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../../GormCore/GormCore.framework \
-L../../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) \
-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-L../../GormCore/GormCore.framework
$(BUNDLE_NAME)_LIBRARIES_DEPEND_UPON += -lInterfaceBuilder -lGormCore
endif