2005-11-18 Adam Fedor <fedor@gnu.org>

* GNUmakefile.preamble: Change 'whereis' to which. (Make sure if it's
        portable, Serg Stoyan). Correct ADDITIONAL_LIB_DIRS.
        * Library/PCLogController.h: Change tags to PC_* because of conflict
        on MingW. And is use in code.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/projectcenter/trunk@22041 72102866-910b-0410-8b05-ffd578937521

Documentation/ChangeLog

@@ -1,3 +1,10 @@
+2005-11-18 Adam Fedor  <fedor@gnu.org>
+
+	* GNUmakefile.preamble: Change 'whereis' to which. (Make sure if it's
+	portable, Serg Stoyan). Correct ADDITIONAL_LIB_DIRS.
+	* Library/PCLogController.h: Change tags to PC_* because of conflict
+	on MingW. And is use in code.
+
 2005-11-15 Serg Stoyan <stoyan255@ukr.net>
 
 	* Library/GNUmakefile: Change framework version to 0.4.3

GNUmakefile.preamble

@@ -24,8 +24,9 @@
 #  If not, write to the Free Software Foundation,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-GMAKE = `whereis -b gmake`
-GDB = `whereis -b gdb`
+# TODO: Make sure if it's portable
+GMAKE = `which -b gmake`
+GDB = `which -b gdb`
 
 #
 # Flags dealing with compiling and linking
@@ -48,7 +49,8 @@ ADDITIONAL_INCLUDE_DIRS += -I./ -I./Headers
 ADDITIONAL_LDFLAGS +=
 
 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current
+ADDITIONAL_LIB_DIRS += -L./Library/ProjectCenter.framework/Versions/Current \
+                       -L./Library/ProjectCenter.framework
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_GUI_LIBS += -lProjectCenter

Library/GNUmakefile.preamble

@@ -47,7 +47,7 @@ ADDITIONAL_OBJCFLAGS += -Wall
 ADDITIONAL_CFLAGS +=
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../
+ADDITIONAL_INCLUDE_DIRS += -I..
 
 # Additional LDFLAGS to pass to the linker
 #ADDITIONAL_LDFLAGS += 

Library/PCLogController.h

@@ -28,10 +28,10 @@
 
 #include <AppKit/AppKit.h>
 
-#define INFO	0
-#define STATUS	1
-#define WARNING	2
-#define ERROR	3
+#define PC_INFO		0
+#define PC_STATUS	1
+#define PC_WARNING	2
+#define PC_ERROR	3
 
 // --- Functions
 void

Library/PCLogController.m

@@ -40,7 +40,7 @@ PCLogInfo(id sender, NSString* format, ...)
   va_list ap;
 
   va_start(ap, format);
-  PCLog(sender, INFO, format, ap);
+  PCLog(sender, PC_INFO, format, ap);
   va_end(ap);
 }
 
@@ -50,7 +50,7 @@ PCLogStatus(id sender, NSString* format, ...)
   va_list ap;
 
   va_start(ap, format);
-  PCLog(sender, STATUS, format, ap);
+  PCLog(sender, PC_STATUS, format, ap);
   va_end(ap);
 }
 
@@ -60,7 +60,7 @@ PCLogWarning(id sender, NSString* format, ...)
   va_list ap;
 
   va_start(ap, format);
-  PCLog(sender, WARNING, format, ap);
+  PCLog(sender, PC_WARNING, format, ap);
   va_end(ap);
 }
 
@@ -70,7 +70,7 @@ PCLogError(id sender, NSString* format, ...)
   va_list ap;
 
   va_start(ap, format);
-  PCLog(sender, ERROR, format, ap);
+  PCLog(sender, PC_ERROR, format, ap);
   va_end(ap);
 }
 
@@ -148,24 +148,24 @@ static PCLogController *_logCtrllr = nil;
 
   switch (tag) 
     {
-    case INFO:
+    case PC_INFO:
       [textAttributes 
 	setObject:[NSColor colorWithDeviceRed:.0 green:.0 blue:.0 alpha:1.0]
 	   forKey:NSForegroundColorAttributeName];
       break;
-    case STATUS:
+    case PC_STATUS:
       [textAttributes 
 	setObject:[NSColor colorWithDeviceRed:.0 green:.35 blue:.0 alpha:1.0]
 	   forKey:NSForegroundColorAttributeName];
       break;
       
-    case WARNING:
+    case PC_WARNING:
       [textAttributes 
 	setObject:[NSColor colorWithDeviceRed:.56 green:.45 blue:.0 alpha:1.0]
 	   forKey:NSForegroundColorAttributeName];
       break;
 
-    case ERROR:
+    case PC_ERROR:
       [textAttributes 
 	setObject:[NSColor colorWithDeviceRed:.63 green:.0 blue:.0 alpha:1.0]
 	   forKey:NSForegroundColorAttributeName];

PCAppController.m

@@ -139,7 +139,7 @@
     }
 
   [logController 
-    logMessage:@"Loading additional subsystems..." withTag:INFO sender:self];
+    logMessage:@"Loading additional subsystems..." withTag:PC_INFO sender:self];
 
   doServer = [[PCServer alloc] init];