From 73e7da5fb75aebbe1d336583391f486c4505eb12 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Tue, 27 Dec 2011 23:38:07 +0100 Subject: [PATCH] Make it possible to have implementations in different toolkits. Also, make it possible to share the headers. --- Makefile => gtk/Makefile | 6 +++--- OGApplication.m => gtk/OGApplication.m | 0 OGBox.m => gtk/OGBox.m | 0 OGButton.m => gtk/OGButton.m | 0 OGHBox.m => gtk/OGHBox.m | 0 OGVBox.m => gtk/OGVBox.m | 0 OGWidget.m => gtk/OGWidget.m | 0 OGWindow.m => gtk/OGWindow.m | 0 test.m => gtk/test.m | 0 OGApplication.h => headers/OGApplication.h | 0 OGBox.h => headers/OGBox.h | 0 OGButton.h => headers/OGButton.h | 0 OGHBox.h => headers/OGHBox.h | 0 OGVBox.h => headers/OGVBox.h | 0 OGWidget.h => headers/OGWidget.h | 0 OGWindow.h => headers/OGWindow.h | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename Makefile => gtk/Makefile (71%) rename OGApplication.m => gtk/OGApplication.m (100%) rename OGBox.m => gtk/OGBox.m (100%) rename OGButton.m => gtk/OGButton.m (100%) rename OGHBox.m => gtk/OGHBox.m (100%) rename OGVBox.m => gtk/OGVBox.m (100%) rename OGWidget.m => gtk/OGWidget.m (100%) rename OGWindow.m => gtk/OGWindow.m (100%) rename test.m => gtk/test.m (100%) rename OGApplication.h => headers/OGApplication.h (100%) rename OGBox.h => headers/OGBox.h (100%) rename OGButton.h => headers/OGButton.h (100%) rename OGHBox.h => headers/OGHBox.h (100%) rename OGVBox.h => headers/OGVBox.h (100%) rename OGWidget.h => headers/OGWidget.h (100%) rename OGWindow.h => headers/OGWindow.h (100%) diff --git a/Makefile b/gtk/Makefile similarity index 71% rename from Makefile rename to gtk/Makefile index 1dc32a8..19c9c45 100644 --- a/Makefile +++ b/gtk/Makefile @@ -1,18 +1,18 @@ PREFIX ?= /usr/local all: - @objfw-compile -Wall -g --lib 0.0 -o objgui \ + @objfw-compile -Wall -g --lib 0.0 -o objgui -I../headers \ `pkg-config --cflags --libs gtk+-3.0` \ `ls *.m | fgrep -v test.m` test: - @objfw-compile -Wall -g -o test \ + @objfw-compile -Wall -g -o test -I../headers \ `pkg-config --cflags --libs gtk+-3.0` \ *.m install: mkdir -p ${PREFIX}/include/ObjGUI - cp *.h ${PREFIX}/include/ObjGUI/ + cp ../headers/*.h ${PREFIX}/include/ObjGUI/ cp libobjgui.so ${PREFIX}/lib/libobjgui.so.0.0 ln -sf libobjgui.so.0.0 ${PREFIX}/lib/libobjgui.so.0 ln -sf libobjgui.so.0 ${PREFIX}/lib/libobjgui.so diff --git a/OGApplication.m b/gtk/OGApplication.m similarity index 100% rename from OGApplication.m rename to gtk/OGApplication.m diff --git a/OGBox.m b/gtk/OGBox.m similarity index 100% rename from OGBox.m rename to gtk/OGBox.m diff --git a/OGButton.m b/gtk/OGButton.m similarity index 100% rename from OGButton.m rename to gtk/OGButton.m diff --git a/OGHBox.m b/gtk/OGHBox.m similarity index 100% rename from OGHBox.m rename to gtk/OGHBox.m diff --git a/OGVBox.m b/gtk/OGVBox.m similarity index 100% rename from OGVBox.m rename to gtk/OGVBox.m diff --git a/OGWidget.m b/gtk/OGWidget.m similarity index 100% rename from OGWidget.m rename to gtk/OGWidget.m diff --git a/OGWindow.m b/gtk/OGWindow.m similarity index 100% rename from OGWindow.m rename to gtk/OGWindow.m diff --git a/test.m b/gtk/test.m similarity index 100% rename from test.m rename to gtk/test.m diff --git a/OGApplication.h b/headers/OGApplication.h similarity index 100% rename from OGApplication.h rename to headers/OGApplication.h diff --git a/OGBox.h b/headers/OGBox.h similarity index 100% rename from OGBox.h rename to headers/OGBox.h diff --git a/OGButton.h b/headers/OGButton.h similarity index 100% rename from OGButton.h rename to headers/OGButton.h diff --git a/OGHBox.h b/headers/OGHBox.h similarity index 100% rename from OGHBox.h rename to headers/OGHBox.h diff --git a/OGVBox.h b/headers/OGVBox.h similarity index 100% rename from OGVBox.h rename to headers/OGVBox.h diff --git a/OGWidget.h b/headers/OGWidget.h similarity index 100% rename from OGWidget.h rename to headers/OGWidget.h diff --git a/OGWindow.h b/headers/OGWindow.h similarity index 100% rename from OGWindow.h rename to headers/OGWindow.h