Attachment #50645 for bug #23207

Line Link Here

(-)file_not_specified_in_diff (-11 / +118 lines)
0	-- glui_v2_2.orig/example1.cpp	0	++ glui_v2_2/example1.cpp
Lines 85-91 Link Here
85		85
86	/************************************** main() ******************/	86	/************************************** main() ******************/
87		87
88	void main(int argc, char* argv[])	88	int main(int argc, char* argv[])
89	{	89	{
90	/****************************************/	90	/****************************************/
91	/* Initialize GLUT and create window */	91	/* Initialize GLUT and create window */
Lines 136-141 Link Here
136	GLUI_Master.set_glutIdleFunc( myGlutIdle );	136	GLUI_Master.set_glutIdleFunc( myGlutIdle );
137		137
138	glutMainLoop();	138	glutMainLoop();
		139
		140	return 0;
139	}	141	}
140		142
141		143
142	-- glui_v2_2.orig/example2.cpp	144	++ glui_v2_2/example2.cpp
Lines 181-187 Link Here
181		181
182	/************************************** main() ******************/	182	/************************************** main() ******************/
183		183
184	void main(int argc, char* argv[])	184	int main(int argc, char* argv[])
185	{	185	{
186	/****************************************/	186	/****************************************/
187	/* Initialize GLUT and create window */	187	/* Initialize GLUT and create window */
Lines 244-247 Link Here
244	GLUI_Master.set_glutIdleFunc( myGlutIdle );	244	GLUI_Master.set_glutIdleFunc( myGlutIdle );
245		245
246	glutMainLoop();	246	glutMainLoop();
		247
		248	return 0;
247	}	249	}
248	-- glui_v2_2.orig/example3.cpp	250	++ glui_v2_2/example3.cpp
Lines 263-269 Link Here
263		263
264	/************************************** main() ******************/	264	/************************************** main() ******************/
265		265
266	void main(int argc, char* argv[])	266	int main(int argc, char* argv[])
267	{	267	{
268	/****************************************/	268	/****************************************/
269	/* Initialize GLUT and create window */	269	/* Initialize GLUT and create window */
Lines 392-396 Link Here
392		392
393	/** Regular GLUT main loop **/	393	/** Regular GLUT main loop **/
394	glutMainLoop();	394	glutMainLoop();
		395
		396	return 0;
395	}	397	}
396		398
397	-- glui_v2_2.orig/example4.cpp	399	++ glui_v2_2/example4.cpp
Lines 253-259 Link Here
253		253
254	/************************************** main() ******************/	254	/************************************** main() ******************/
255		255
256	void main(int argc, char* argv[])	256	int main(int argc, char* argv[])
257	{	257	{
258	/****************************************/	258	/****************************************/
259	/* Initialize GLUT and create window */	259	/* Initialize GLUT and create window */
Lines 371-375 Link Here
371	/** Regular GLUT main loop **/	371	/** Regular GLUT main loop **/
372		372
373	glutMainLoop();	373	glutMainLoop();
		374
		375	return 0;
374	}	376	}
375		377
376	-- glui_v2_2.orig/example5.cpp	378	++ glui_v2_2/example5.cpp
Lines 310-316 Link Here
310		310
311	/************************************** main() ******************/	311	/************************************** main() ******************/
312		312
313	void main(int argc, char* argv[])	313	int main(int argc, char* argv[])
314	{	314	{
315	/****************************************/	315	/****************************************/
316	/* Initialize GLUT and create window */	316	/* Initialize GLUT and create window */
Lines 478-482 Link Here
478	/** Regular GLUT main loop **/	478	/** Regular GLUT main loop **/
479		479
480	glutMainLoop();	480	glutMainLoop();
		481
		482	return 0;
481	}	483	}
482		484
483	-- glui_v2_2.orig/Makefile	485	++ glui_v2_2/Makefile
Line 0 Link Here
		1	VERSION = 2.2
		2	MAJOR = 2
		3	LIBNAME = libglui
		4	SONAME = $(LIBNAME).so.$(MAJOR)
		5
		6	CC = cc
		7	CXX = c++
		8
		9	CPPFLAGS = $(INCS)
		10	CFLAGS =
		11	CXXFLAGS =
		12	LDFLAGS =
		13	LDLIBS = $(LIBS)
		14
		15	GLLIBS = -lGL -lGLU -lglut
		16	INCS =
		17	LIBS = $(GLLIBS) -lm
		18
		19	LIBGLUI = -Llib -lglui
		20
		21	GLUI = lib/$(LIBNAME).a
		22	SO_GLUI = lib/$(LIBNAME).so.$(VERSION)
		23
		24	EXAMPLES = bin/example1 bin/example2 bin/example3 bin/example4 bin/example5
		25
		26	all: static shared examples
		27	static: $(GLUI)
		28	shared: $(SO_GLUI)
		29	examples: $(EXAMPLES)
		30
		31	GLUI_SRCS = algebra3.cpp arcball.cpp $(wildcard glui*.cpp) quaternion.cpp
		32	GLUI_OBJS = $(GLUI_SRCS:.cpp=.o)
		33
		34	$(GLUI): $(GLUI_OBJS)
		35	@echo "Creating library"
		36	test -d $(dir $@) \|\| mkdir -p $(dir $@)
		37	ar -r $@ $^
		38
		39	$(SO_GLUI): $(GLUI_OBJS)
		40	@echo "Creating shared library"
		41	$(CXX) -o $@ -shared -Wl,-soname,$(SONAME) $^ $(LDLIBS)
		42
		43	bin/example%: example%.o $(GLUI)
		44	@echo Linking $(notdir $@)
		45	test -d $(dir $@) \|\| mkdir -p $(dir $@)
		46	$(CXX) $(LDFLAGS) $(LDLIBS) $< $(LIBGLUI) -o $@
		47
		48	.cpp.o:
		49	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(INCS) $<
		50
		51	.c.o:
		52	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $<
		53
		54	clean:
		55	$(RM) *.o
		56	$(RM) -r bin libs
		57	$(RM) tags *~
		58
		59	.SUFFIXES: .cpp
		60	.PHONY: all static shared examples
		61
		62	algebra3.o: algebra3.h
		63	arcball.o: arcball.h algebra3.h quaternion.h
		64	example1.o: glui.h
65	example2.o: glui.h
66	example3.o: glui.h
67	example4.o: glui.h
68	glui.o: glui.h
69	glui_add_controls.o: glui.h
70	glui_bitmap_img_data.o: glui_img_checkbox_0.c glui_img_checkbox_1.c
71	glui_bitmap_img_data.o: glui_img_radiobutton_0.c glui_img_radiobutton_1.c
72	glui_bitmap_img_data.o: glui_img_uparrow.c glui_img_downarrow.c
73	glui_bitmap_img_data.o: glui_img_leftarrow.c glui_img_rightarrow.c
74	glui_bitmap_img_data.o: glui_img_spinup_1.c glui_img_spinup_0.c
75	glui_bitmap_img_data.o: glui_img_spindown_1.c glui_img_spindown_0.c
76	glui_bitmap_img_data.o: glui_img_checkbox_0_dis.c glui_img_checkbox_1_dis.c
77	glui_bitmap_img_data.o: glui_img_radiobutton_0_dis.c
78	glui_bitmap_img_data.o: glui_img_radiobutton_1_dis.c glui_img_spinup_dis.c
79	glui_bitmap_img_data.o: glui_img_spindown_dis.c
80	glui_bitmaps.o: glui.h
81	glui_button.o: glui.h
82	glui_checkbox.o: glui.h
83	glui_column.o: glui.h
84	glui_control.o: glui.h
85	glui_edittext.o: glui.h
86	glui_node.o: glui.h
87	glui_panel.o: glui.h
88	glui_radio.o: glui.h
89	glui_separator.o: glui.h
90	glui_spinner.o: glui.h
91	glui_statictext.o: glui.h
92	quaternion.o: quaternion.h algebra3.h
93	glui_translation.o: glui.h
94	glui_rotation.o: glui.h
95	glui_mouse_iaction.o: glui.h
96	glui_listbox.o: glui.h
97	glui_rollout.o: glui.h

Return to bug 23207