Author: rmottola
Date: Tue Jun 21 17:57:21 2016
New Revision: 39897
URL: http://svn.gna.org/viewcvs/gnustep?rev=39897&view=rev
Log:
insert windows special link dirs again
Modified:
apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble
apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble
apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble
Modified: apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Defaults/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -20,7 +20,12 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/FileSystem/GNUmakefile.preamble
Tue Jun 21 17:57:21 2016
@@ -20,7 +20,12 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Fonts/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -20,7 +20,12 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Internet/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -20,7 +20,13 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
+
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/ModifierKeys/GNUmakefile.preamble
Tue Jun 21 17:57:21 2016
@@ -20,7 +20,12 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Themes/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -20,7 +20,12 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/TimeZone/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -20,7 +20,12 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/Modules/Volumes/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -20,7 +20,13 @@
FRAMEWORK_NAME = PreferencePanes
endif
-ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
+
#
# Flags dealing with installing and uninstalling
Modified: apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble?rev=39897&r1=39896&r2=39897&view=diff
==============================================================================
--- apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble
(original)
+++ apps/systempreferences/trunk/SystemPreferences/GNUmakefile.preamble Tue Jun
21 17:57:21 2016
@@ -25,7 +25,12 @@
# it doesn't work for you, you should install the PreferencesPanes
# framework before compiling this application.
-ADDITIONAL_LIB_DIRS +=
-L../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+# Even with gnustep-make v2, we need a windows special case
+ifeq ($(findstring mingw32, $(GNUSTEP_TARGET_OS)), mingw32)
+ ADDITIONAL_LIB_DIRS +=
-L../PreferencePanes/$(FRAMEWORK_NAME).framework/$(GNUSTEP_TARGET_LDIR)
+else
+ ADDITIONAL_LIB_DIRS +=
-L../PreferencePanes/$(FRAMEWORK_NAME).framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+endif
#
# Flags dealing with installing and uninstalling
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
