From 955047db8f4579ff42d595d8e89b8ccc9fe66af0 Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Wed, 14 Jul 2004 12:52:10 +0000
Subject: [PATCH] make stuff compile
---
src/zmapDraw/makefile | 18 +++++-------------
src/zmapDraw/zmapDraw.c | 12 +++++++++---
src/zmapWindow/makefile | 4 ++--
src/zmapWindow/zmapWindow.c | 9 +++++++--
4 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/zmapDraw/makefile b/src/zmapDraw/makefile
index f437b9864..ca7df470c 100755
--- a/src/zmapDraw/makefile
+++ b/src/zmapDraw/makefile
@@ -10,26 +10,18 @@ MAKE_DIR = $(ROOT_DIRECTORY)/zmapMake
# local macros
-WIND_PRIV_HDRS = zmapWindow_P.h
+#WIND_PRIV_HDRS = zmapWindow_P.h
-PUB_HDRS = seqregion.h stringbucket.h zmapDraw.h zmapWindow.h
+PUB_HDRS = zmapDraw.h
#PUB_HDRS = zmapWindow.h
-WIND_SRC = seqregion.c stringbucket.c \
- zmapbccol.c zmapcols.c zmapDraw.c \
- zmapWindow.c zmapWindowFrame.c GFF_scaffold.c \
- zmapWindowDrawFeatures.c
-#WIND_SRC = zmapWindow.c zmapWindowFrame.c
+WIND_SRC = zmapDraw.c
-WIND_OBJ = seqregion.o stringbucket.o \
- zmapbccol.o zmapcols.o zmapDraw.o \
- zmapWindow.o zmapWindowFrame.o GFF_scaffold.o \
- zmapWindowDrawFeatures.o
-#WIND_OBJ = zmapWindow.o zmapWindowFrame.o
+WIND_OBJ = zmapDraw.o
ZMAP_LIB = libzmap.a
-FUNCS = zmapfuncs.c zmapfuncs.h
+#FUNCS = zmapfuncs.c zmapfuncs.h
#
# These must all be set for the common includes to work.
diff --git a/src/zmapDraw/zmapDraw.c b/src/zmapDraw/zmapDraw.c
index 4e647bbab..8bfa18f9a 100755
--- a/src/zmapDraw/zmapDraw.c
+++ b/src/zmapDraw/zmapDraw.c
@@ -1,4 +1,4 @@
-/* Last edited: Jul 5 14:37 2004 (rnc) */
+/* Last edited: Jul 14 13:47 2004 (edgrif) */
/* file: zmapcontrol.c
* Author: Simon Kelley (srk@sanger.ac.uk)
* Copyright (c) Sanger Institute, 2003
@@ -26,8 +26,8 @@
*/
#include <glib.h>
-#include <zmapDraw.h>
-#include <seqregion.h>
+#include <ZMap/zmapDraw.h>
+#include <../zmapWindow/seqregion.h> /* Hack to compile for now... */
@@ -55,8 +55,14 @@ void displayText(FooCanvasGroup *group, char *text, double x, double y)
void zmRegBox(ZMapPane pane, int box, ZMapColumn *col, void *arg)
{
+
+#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
+ /* hack to get everything to compile......... */
+
zMapPaneSetBox2Col(pane, col, box);
zMapPaneSetBox2Seg(pane, arg, box);
+#endif /* ED_G_NEVER_INCLUDE_THIS_CODE */
+
return;
}
diff --git a/src/zmapWindow/makefile b/src/zmapWindow/makefile
index f437b9864..0d2e5317f 100755
--- a/src/zmapWindow/makefile
+++ b/src/zmapWindow/makefile
@@ -16,13 +16,13 @@ PUB_HDRS = seqregion.h stringbucket.h zmapDraw.h zmapWindow.h
#PUB_HDRS = zmapWindow.h
WIND_SRC = seqregion.c stringbucket.c \
- zmapbccol.c zmapcols.c zmapDraw.c \
+ zmapbccol.c zmapcols.c \
zmapWindow.c zmapWindowFrame.c GFF_scaffold.c \
zmapWindowDrawFeatures.c
#WIND_SRC = zmapWindow.c zmapWindowFrame.c
WIND_OBJ = seqregion.o stringbucket.o \
- zmapbccol.o zmapcols.o zmapDraw.o \
+ zmapbccol.o zmapcols.o \
zmapWindow.o zmapWindowFrame.o GFF_scaffold.o \
zmapWindowDrawFeatures.o
#WIND_OBJ = zmapWindow.o zmapWindowFrame.o
diff --git a/src/zmapWindow/zmapWindow.c b/src/zmapWindow/zmapWindow.c
index 5d6985530..d7e10b6a4 100755
--- a/src/zmapWindow/zmapWindow.c
+++ b/src/zmapWindow/zmapWindow.c
@@ -28,9 +28,9 @@
*
* Exported functions: See ZMap/zmapWindow.h
* HISTORY:
- * Last edited: Jul 13 16:24 2004 (edgrif)
+ * Last edited: Jul 14 13:47 2004 (edgrif)
* Created: Thu Jul 24 14:36:27 2003 (edgrif)
- * CVS info: $Id: zmapWindow.c,v 1.16 2004-07-14 09:12:05 edgrif Exp $
+ * CVS info: $Id: zmapWindow.c,v 1.17 2004-07-14 12:52:11 edgrif Exp $
*-------------------------------------------------------------------
*/
@@ -537,6 +537,8 @@ void zMapRegionFreeDNA(ZMapRegion *region)
+
+
#ifdef ED_G_NEVER_INCLUDE_THIS_CODE
// ZMapPane functions
@@ -554,6 +556,7 @@ void zMapPaneNewBox2Col(ZMapPane pane, int elements)
+
GArray *zMapPaneSetBox2Col(ZMapPane pane, ZMapColumn *col, int index)
{
return g_array_insert_val(pane->box2col, index, col);
@@ -598,6 +601,8 @@ void zMapPaneFreeBox2Seg(ZMapPane pane)
}
+
+
FooCanvasItem *zMapPaneGetGroup(ZMapPane pane)
{
return pane->group;
--
GitLab