Author: mlytwyn
Date: Thu May 12 18:14:20 2016
New Revision: 39743
URL: http://svn.gna.org/viewcvs/gnustep?rev=39743&view=rev
Log:
Fix GNUmakefile(s) for proper GNUstep operation on MSUserNotifications
Modified:
libs/back/branches/gnustep_testplant_branch/GNUmakefile
libs/back/branches/gnustep_testplant_branch/Source/win32/GNUmakefile
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/GNUmakefile
Modified: libs/back/branches/gnustep_testplant_branch/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/GNUmakefile?rev=39743&r1=39742&r2=39743&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/GNUmakefile (original)
+++ libs/back/branches/gnustep_testplant_branch/GNUmakefile Thu May 12
18:14:20 2016
@@ -43,7 +43,6 @@
include $(GNUSTEP_MAKEFILES)/common.make
include ./Version
--include ../back/Version
#
# The list of subproject directories
Modified: libs/back/branches/gnustep_testplant_branch/Source/win32/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/GNUmakefile?rev=39743&r1=39742&r2=39743&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/GNUmakefile
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/GNUmakefile
Thu May 12 18:14:20 2016
@@ -33,8 +33,14 @@
# The library to be compiled, as a library or as a bundle
SUBPROJECT_NAME=win32
-#win32_SUBPROJECTS = MSUserNotifications
-SUBPROJECTS = MSUserNotifications
+# We NEED the base version so MSUserNotifications can compile correctly
+# We'll omit it if for some reason we couldn't get the Version file
+ifdef GNUSTEP_BASE_MAJOR_VERSION
+ ifdef GNUSTEP_BASE_MINOR_VERSION
+ #$(info building MSUserNotifications bundle...)
+ SUBPROJECTS = MSUserNotifications
+ endif
+endif
win32_LOCALIZED_RESOURCE_FILES = \
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/GNUmakefile?rev=39743&r1=39742&r2=39743&view=diff
==============================================================================
---
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/GNUmakefile
(original)
+++
libs/back/branches/gnustep_testplant_branch/Source/win32/MSUserNotifications/GNUmakefile
Thu May 12 18:14:20 2016
@@ -16,6 +16,9 @@
endif
BUNDLE_NAME = NSUserNotification
+
+# Get common definitions - needed for base version information
+-include $(GNUSTEP_MAKEFILES)/common.make
NSUserNotification_NEEDS_GUI = NO
NSUserNotification_CFLAGS += -DWINVER=0x0600 -D_WIN32_IE=0x0600 -DBUILD_DLL
-fms-extensions
@@ -36,20 +39,21 @@
SUBPROJECTS = ToastNotifications TaskbarNotifications
# Set this to the ROOT DIRECTORY of your GNUstep build that contains the
'core' directory...
-BASE_VERSION_DEFINED =
-ifneq ($(MAJOR_VERSION),)
- ifneq ($(MINOR_VERSION),)
+ifdef GNUSTEP_BASE_MAJOR_VERSION
+ ifdef GNUSTEP_BASE_MINOR_VERSION
BASE_VERSION_DEFINED=1
endif
endif
-ifdef ($(BASE_VERSION_DEFINED),)
+ifndef BASE_VERSION_DEFINED
ifeq ($(GNUSTEP_BUILD_ROOT),)
$(error You need to checkout core/base and/or set GNUSTEP_BUILD_ROOT to
your gnustep root containing 'core/base' before compiling!)
endif
include ${GNUSTEP_BUILD_ROOT}/core/base/Version
+ GNUSTEP_BASE_MAJOR_VERSION=$(MAJOR_VERSION)
+ GNUSTEP_BASE_MAJOR_VERSION=$(MINOR_VERSION)
BASE_VERSION_DEFINED=1
endif
-libgnustep-base_INTERFACE_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libgnustep-base_INTERFACE_VERSION=$(GNUSTEP_BASE_MAJOR_VERSION).$(GNUSTEP_BASE_MINOR_VERSION)
NSUserNotification_INSTALL_DIR =
$(GNUSTEP_LIBRARY)/Libraries/gnustep-base/Versions/$(libgnustep-base_INTERFACE_VERSION)/Resources/
#include GNUmakefile.postamble
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
