add install for makefile

git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@339 b9cfdab3-6d41-4d17-bbe4-086880011989

GNUmakefile

@@ -1,5 +1,7 @@
 # $Id$
 
+PREFIX = /usr/milsko
+
 ifeq ($(TARGET),)
 TARGET = $(shell uname -s)
 endif
@@ -153,13 +155,25 @@ OOL_OBJS += oosrc/widget/vulkan.o
 EXAMPLES += examples/vulkan$(EXEC)
 endif
 
-.PHONY: all format clean lib oolib examples
+.PHONY: all install format clean lib oolib examples
 
 all: lib examples
 lib: src/$(LIB)Mw$(SO)
 oolib: oosrc/$(LIB)MwOO$(SO)
 examples: $(EXAMPLES)
 
+install: lib oolib
+	mkdir -p $(PREFIX)/lib
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(PREFIX)/include
+	for i in src oosrc; do \
+		cp $$i/*.so $(PREFIX)/lib/ ; \
+		cp $$i/*.a $(PREFIX)/lib/ ; \
+		cp $$i/*.dll $(PREFIX)/bin/ ; \
+	done ; true
+	cp -rf include/Mw $(PREFIX)/include/
+	cp -rf include/MwOO $(PREFIX)/include/
+
 format:
 	clang-format --verbose -i `find oosrc src include examples tools "(" -name "*.c" -or -name "*.h" ")" -and -not -name "stb_*.h"`
 	perltidy -b -bext='/' --paren-tightness=2 `find tools -name "*.pl"`

README.txt

@@ -88,6 +88,8 @@ D. MinGW-w64/GCC/Clang
 
           USE_STB_IMAGE - Use stb_image or not.
 
+          PREFIX        - Installation destination directory.
+
 
                                 Makefile targets
 
@@ -101,4 +103,6 @@ D. MinGW-w64/GCC/Clang
 
           all      - Builds lib and examples
 
+          install  - Installs Milsko to PREFIX
+
  -- Nishi  (nishi@nishi.boats) 

doc/index.html

@@ -2393,7 +2393,7 @@
 <pre id="Mw_Widget_ListBox_h__MwListBoxInsertMultiple">MWDECL <B><FONT COLOR="#228B22">void</FONT></B> <B><FONT COLOR="#0000FF">MwListBoxInsertMultiple</FONT></B> (
 	MwWidget handle,
 	<B><FONT COLOR="#228B22">int</FONT></B> index,
-	<B><FONT COLOR="#228B22">char</FONT></B>* <B><FONT COLOR="#228B22">const</FONT></B>* text,
+	<B><FONT COLOR="#228B22">char</FONT></B>** text,
 	<B><FONT COLOR="#228B22">int</FONT></B> count
 );</pre>
 <dl>

include/MwOO/Widget/ListBox.h

@@ -9,7 +9,7 @@ class ListBox : public MwOO::Base {
       public:
 	ListBox(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
 	void	    Insert(int index, const char* text);
-	void	    InsertMultiple(int index, char* const* text, int count);
+	void	    InsertMultiple(int index, char** text, int count);
 	void	    Delete(int index);
 	const char* Get(int index);
 	void	    SetBackground(const char* value);

oosrc/widget/listbox.cc

@@ -8,7 +8,7 @@ MwOO::ListBox::ListBox(const char* widget_name, MwOO::Base* parent, int x, int y
 void MwOO::ListBox::Insert(int index, const char* text){
 	MwListBoxInsert(this->widget, index, text);
 }
-void MwOO::ListBox::InsertMultiple(int index, char* const* text, int count){
+void MwOO::ListBox::InsertMultiple(int index, char** text, int count){
 	MwListBoxInsertMultiple(this->widget, index, text, count);
 }
 void MwOO::ListBox::Delete(int index){

tools/readme.pl

@@ -126,6 +126,8 @@ c("OPENGL        - Build OpenGL widget or not.", 60);
 l("");
 c("USE_STB_IMAGE - Use stb_image or not.", 60);
 l("");
+c("PREFIX        - Installation destination directory.", 60);
+l("");
 
 l("");
 c("Makefile targets");
@@ -139,8 +141,10 @@ l("");
 c("examples - Builds examples", 60);
 l("");
 c("all      - Builds lib and examples", 60);
-
 l("");
+c("install  - Installs Milsko to PREFIX", 60);
+l("");
+
 l(" -- Nishi  (nishi\@nishi.boats)");
 
 close(OUT);