summaryrefslogtreecommitdiff
path: root/src/widget
diff options
context:
space:
mode:
authorscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 16:43:55 +0000
committerscarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-07-05 16:43:55 +0000
commit6c4fe3323d79253af707df90623e433ce12c35f2 (patch)
tree36ca640e6865abc26789760ba9fd09a023eb0ba1 /src/widget
parent6ed79c5de77b3f6be5c297cb5432d123ff1ff177 (diff)
* Prechod na novou verzi instalace pseudoautotools -> cmake
* Odstraneni bordelu kterej tu byl (pokud vam neco chybi brecte na me ja to zkusim najit v zaloze) * TODO instalace: SEPSAT AUTORY, IKONKU VYROBIT git-svn-id: http://opensvn.csie.org/tuxanci_ng@94 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/Makefile28
-rw-r--r--src/widget/widget_button.c8
-rw-r--r--src/widget/widget_button.h2
-rw-r--r--src/widget/widget_buttonimage.c8
-rw-r--r--src/widget/widget_buttonimage.h2
-rw-r--r--src/widget/widget_check.c6
-rw-r--r--src/widget/widget_check.h2
-rw-r--r--src/widget/widget_image.c8
-rw-r--r--src/widget/widget_image.h4
-rw-r--r--src/widget/widget_label.c6
-rw-r--r--src/widget/widget_label.h2
-rw-r--r--src/widget/widget_select.c6
-rw-r--r--src/widget/widget_select.h4
-rw-r--r--src/widget/widget_textfield.c8
-rw-r--r--src/widget/widget_textfield.h2
15 files changed, 34 insertions, 62 deletions
diff --git a/src/widget/Makefile b/src/widget/Makefile
deleted file mode 100644
index cdb504b..0000000
--- a/src/widget/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-
-all: widget_button.o widget_buttonimage.o widget_check.o widget_label.o widget_select.o widget_textfield.o widget_image.o
-
-widget_button.o: widget_button.c widget_button.h
- $(CC) $(CFLAGS) -o widget_button.o -c widget_button.c
-
-widget_buttonimage.o: widget_buttonimage.c widget_buttonimage.h
- $(CC) $(CFLAGS) -o widget_buttonimage.o -c widget_buttonimage.c
-
-widget_check.o: widget_check.c widget_check.h
- $(CC) $(CFLAGS) -o widget_check.o -c widget_check.c
-
-widget_image.o: widget_image.c widget_image.h
- $(CC) $(CFLAGS) -o widget_image.o -c widget_image.c
-
-widget_label.o: widget_label.c widget_label.h
- $(CC) $(CFLAGS) -o widget_label.o -c widget_label.c
-
-widget_select.o: widget_select.c widget_select.h
- $(CC) $(CFLAGS) -o widget_select.o -c widget_select.c
-
-widget_textfield.o: widget_textfield.c widget_textfield.h
- $(CC) $(CFLAGS) -o widget_textfield.o -c widget_textfield.c
-
-clean:
- rm -rf *.o
-
-
diff --git a/src/widget/widget_button.c b/src/widget/widget_button.c
index 7f0957b..0bdab86 100644
--- a/src/widget/widget_button.c
+++ b/src/widget/widget_button.c
@@ -1,11 +1,11 @@
#include <stdlib.h>
-#include "base/main.h"
+#include "main.h"
-#include "client/interface.h"
-#include "client/image.h"
-#include "client/font.h"
+#include "interface.h"
+#include "image.h"
+#include "font.h"
#include "widget_button.h"
diff --git a/src/widget/widget_button.h b/src/widget/widget_button.h
index 1662407..5090e55 100644
--- a/src/widget/widget_button.h
+++ b/src/widget/widget_button.h
@@ -3,7 +3,7 @@
#define WIDGET_BUTTON_H
-#include "base/main.h"
+#include "main.h"
#define WIDGET_BUTTON_TIME 10
diff --git a/src/widget/widget_buttonimage.c b/src/widget/widget_buttonimage.c
index 7c59f3b..0b6e961 100644
--- a/src/widget/widget_buttonimage.c
+++ b/src/widget/widget_buttonimage.c
@@ -1,9 +1,9 @@
#include <stdlib.h>
-#include "base/main.h"
-#include "client/interface.h"
-#include "client/font.h"
-#include "client/image.h"
+#include "main.h"
+#include "interface.h"
+#include "font.h"
+#include "image.h"
#include "widget_buttonimage.h"
widget_buttonimage_t* newWidgetButtonimage(SDL_Surface *image, int x, int y, void (*fce_event)(void *))
diff --git a/src/widget/widget_buttonimage.h b/src/widget/widget_buttonimage.h
index d30e5bf..d03423e 100644
--- a/src/widget/widget_buttonimage.h
+++ b/src/widget/widget_buttonimage.h
@@ -1,7 +1,7 @@
#ifndef WIDGET_BUTTONIMAGE_H
-#include "base/main.h"
+#include "main.h"
#define WIDGET_BUTTONIMAGE_H
diff --git a/src/widget/widget_check.c b/src/widget/widget_check.c
index feb2414..192ae9b 100644
--- a/src/widget/widget_check.c
+++ b/src/widget/widget_check.c
@@ -1,8 +1,8 @@
#include <stdlib.h>
-#include "base/main.h"
-#include "client/interface.h"
-#include "client/image.h"
+#include "main.h"
+#include "interface.h"
+#include "image.h"
#include "widget_check.h"
widget_check_t* newWidgetCheck(int x, int y, bool_t status, void (*fce_event)(void *))
diff --git a/src/widget/widget_check.h b/src/widget/widget_check.h
index 68aecd9..2e3a3a3 100644
--- a/src/widget/widget_check.h
+++ b/src/widget/widget_check.h
@@ -3,7 +3,7 @@
#define WIDGET_CHECK_H
-#include "base/main.h"
+#include "main.h"
#define WIDGET_CHECK_TIME_SWITCH_STATUS 5
diff --git a/src/widget/widget_image.c b/src/widget/widget_image.c
index 5e1b743..6437451 100644
--- a/src/widget/widget_image.c
+++ b/src/widget/widget_image.c
@@ -2,10 +2,10 @@
#include <stdlib.h>
#include <stdlib.h>
-#include "base/main.h"
-#include "client/image.h"
-#include "client/interface.h"
-#include "client/font.h"
+#include "main.h"
+#include "image.h"
+#include "interface.h"
+#include "font.h"
#include "widget_image.h"
widget_image_t* newWidgetImage(int x, int y, SDL_Surface *image)
diff --git a/src/widget/widget_image.h b/src/widget/widget_image.h
index 85c98d7..6bb316c 100644
--- a/src/widget/widget_image.h
+++ b/src/widget/widget_image.h
@@ -3,8 +3,8 @@
#define WIDGET_IMAGE_H
-#include "base/main.h"
-#include "client/interface.h"
+#include "main.h"
+#include "interface.h"
typedef struct widget_image
{
diff --git a/src/widget/widget_label.c b/src/widget/widget_label.c
index a472784..15dea4d 100644
--- a/src/widget/widget_label.c
+++ b/src/widget/widget_label.c
@@ -1,9 +1,9 @@
#include <stdlib.h>
-#include "base/main.h"
-#include "client/interface.h"
-#include "client/font.h"
+#include "main.h"
+#include "interface.h"
+#include "font.h"
#include "widget_label.h"
widget_label_t* newWidgetLabel(char *text, int x, int y, int bind)
diff --git a/src/widget/widget_label.h b/src/widget/widget_label.h
index a3bb060..f976bbc 100644
--- a/src/widget/widget_label.h
+++ b/src/widget/widget_label.h
@@ -3,7 +3,7 @@
#define WIDGET_LABEL_H
-#include "base/main.h"
+#include "main.h"
typedef struct widget_label
{
diff --git a/src/widget/widget_select.c b/src/widget/widget_select.c
index 4d10bc4..35a462b 100644
--- a/src/widget/widget_select.c
+++ b/src/widget/widget_select.c
@@ -1,8 +1,8 @@
#include <stdlib.h>
-#include "base/main.h"
-#include "client/interface.h"
-#include "client/font.h"
+#include "main.h"
+#include "interface.h"
+#include "font.h"
#include "widget_select.h"
/*
diff --git a/src/widget/widget_select.h b/src/widget/widget_select.h
index 7bbe5c0..a0bb795 100644
--- a/src/widget/widget_select.h
+++ b/src/widget/widget_select.h
@@ -3,8 +3,8 @@
#define WIDGET_SELECT_H
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
typedef struct widget_select
diff --git a/src/widget/widget_textfield.c b/src/widget/widget_textfield.c
index f93f298..6b9a6c0 100644
--- a/src/widget/widget_textfield.c
+++ b/src/widget/widget_textfield.c
@@ -1,9 +1,9 @@
#include <stdlib.h>
-#include "base/main.h"
-#include "client/interface.h"
-#include "client/font.h"
-#include "client/image.h"
+#include "main.h"
+#include "interface.h"
+#include "font.h"
+#include "image.h"
#include "widget_textfield.h"
widget_textfield_t* newWidgetTextfield(char *text, int x, int y)
diff --git a/src/widget/widget_textfield.h b/src/widget/widget_textfield.h
index 9300bce..1e9517e 100644
--- a/src/widget/widget_textfield.h
+++ b/src/widget/widget_textfield.h
@@ -3,7 +3,7 @@
#define WIDGET_TEXTFIELD_H
-#include "base/main.h"
+#include "main.h"
#define WIDGET_TEXTFIELD_WIDTH 188
#define WIDGET_TEXTFIELD_HEIGHT 36