Put all OpenGL stuff back in FLTKDLL; no separate shared

libraries under WIN32 since WIN32 is so braindead about
export/import crap anyways...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1642 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 172 insertions, 39 deletions

diff --git a/visualc/fltkdll.dsp b/visualc/fltkdll.dsp
index 5b573854d..986be7d4e 100644
--- a/visualc/fltkdll.dsp
+++ b/visualc/fltkdll.dsp
@@ -645,73 +645,72 @@ DEP_CPP_FL_EN=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\src\fl_file_dir.cxx

+SOURCE=..\src\Fl_File_Browser.cxx

 DEP_CPP_FL_FI=\

 	"..\fl\enumerations.h"\

+	"..\fl\filename.h"\

 	"..\fl\fl.h"\

-	"..\fl\fl_ask.h"\

 	"..\fl\fl_browser.h"\

 	"..\fl\fl_browser_.h"\

-	"..\fl\fl_button.h"\

-	"..\fl\fl_choice.h"\

+	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

-	"..\fl\fl_file_chooser.h"\

-	"..\fl\fl_filebrowser.h"\

-	"..\fl\fl_filechooser.h"\

-	"..\fl\fl_fileicon.h"\

+	"..\FL\Fl_File_Browser.H"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_group.h"\

-	"..\fl\fl_input.h"\

-	"..\fl\fl_input_.h"\

-	"..\fl\fl_menu_.h"\

-	"..\fl\fl_menu_item.h"\

-	"..\fl\fl_return_button.h"\

 	"..\fl\fl_scrollbar.h"\

 	"..\fl\fl_slider.h"\

 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

-	"..\fl\fl_window.h"\

 	".\config.h"\

 	

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_File_Browser.cxx

+SOURCE=..\src\Fl_File_Chooser.cxx

 DEP_CPP_FL_FIL=\

 	"..\fl\enumerations.h"\

-	"..\fl\filename.h"\

 	"..\fl\fl.h"\

+	"..\fl\fl_ask.h"\

+	"..\fl\fl_bitmap.h"\

 	"..\fl\fl_browser.h"\

 	"..\fl\fl_browser_.h"\

-	"..\fl\fl_draw.h"\

+	"..\fl\fl_button.h"\

+	"..\fl\fl_choice.h"\

 	"..\fl\fl_export.h"\

-	"..\fl\fl_filebrowser.h"\

-	"..\fl\fl_fileicon.h"\

+	"..\FL\Fl_File_Browser.H"\

+	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_group.h"\

+	"..\fl\fl_image.h"\

+	"..\fl\fl_input.h"\

+	"..\fl\fl_input_.h"\

+	"..\fl\fl_menu_.h"\

+	"..\fl\fl_menu_item.h"\

+	"..\fl\fl_return_button.h"\

 	"..\fl\fl_scrollbar.h"\

 	"..\fl\fl_slider.h"\

 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

-	".\config.h"\

+	"..\fl\fl_window.h"\

 	

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_File_Chooser.cxx

+SOURCE=..\src\Fl_File_Chooser2.cxx

 DEP_CPP_FL_FILE=\

 	"..\fl\enumerations.h"\

+	"..\fl\filename.h"\

 	"..\fl\fl.h"\

 	"..\fl\fl_ask.h"\

-	"..\fl\fl_bitmap.h"\

 	"..\fl\fl_browser.h"\

 	"..\fl\fl_browser_.h"\

 	"..\fl\fl_button.h"\

 	"..\fl\fl_choice.h"\

 	"..\fl\fl_export.h"\

-	"..\fl\fl_filebrowser.h"\

-	"..\fl\fl_filechooser.h"\

-	"..\fl\fl_fileicon.h"\

+	"..\FL\Fl_File_Browser.H"\

+	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_group.h"\

-	"..\fl\fl_image.h"\

 	"..\fl\fl_input.h"\

 	"..\fl\fl_input_.h"\

 	"..\fl\fl_menu_.h"\

@@ -722,14 +721,15 @@ DEP_CPP_FL_FILE=\
 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

 	

 # End Source File

 # Begin Source File

 

-SOURCE=..\src\Fl_File_Chooser2.cxx

-DEP_CPP_FL_FILEC=\

+SOURCE=..\src\fl_file_dir.cxx

+DEP_CPP_FL_FILE_=\

 	"..\fl\enumerations.h"\

-	"..\fl\filename.h"\

 	"..\fl\fl.h"\

 	"..\fl\fl_ask.h"\

 	"..\fl\fl_browser.h"\

@@ -737,9 +737,9 @@ DEP_CPP_FL_FILEC=\
 	"..\fl\fl_button.h"\

 	"..\fl\fl_choice.h"\

 	"..\fl\fl_export.h"\

-	"..\fl\fl_filebrowser.h"\

-	"..\fl\fl_filechooser.h"\

-	"..\fl\fl_fileicon.h"\

+	"..\FL\Fl_File_Browser.H"\

+	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_group.h"\

 	"..\fl\fl_input.h"\

 	"..\fl\fl_input_.h"\

@@ -751,20 +751,19 @@ DEP_CPP_FL_FILEC=\
 	"..\fl\fl_valuator.h"\

 	"..\fl\fl_widget.h"\

 	"..\fl\fl_window.h"\

-	"..\fl\win32.h"\

-	"..\fl\x.h"\

+	".\config.h"\

 	

 # End Source File

 # Begin Source File

 

 SOURCE=..\src\Fl_File_Icon.cxx

-DEP_CPP_FL_FILEI=\

+DEP_CPP_FL_FILE_I=\

 	"..\fl\enumerations.h"\

 	"..\fl\filename.h"\

 	"..\fl\fl.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

-	"..\fl\fl_fileicon.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_widget.h"\

 	".\config.h"\

 	

@@ -819,6 +818,59 @@ DEP_CPP_FL_GET=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\Fl_Gl_Choice.cxx

+DEP_CPP_FL_GL=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	"..\src\Fl_Gl_Choice.H"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\Fl_Gl_Overlay.cxx

+DEP_CPP_FL_GL_=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_gl_window.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	"..\src\Fl_Gl_Choice.H"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\Fl_Gl_Window.cxx

+DEP_CPP_FL_GL_W=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_gl_window.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	"..\src\Fl_Gl_Choice.H"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\Fl_grab.cxx

 DEP_CPP_FL_GR=\

 	"..\fl\enumerations.h"\

@@ -857,8 +909,8 @@ DEP_CPP_FL_HE=\
 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

 	"..\fl\fl_group.h"\

-	"..\fl\fl_helpdialog.h"\

-	"..\fl\fl_helpview.h"\

+	"..\FL\Fl_Help_Dialog.H"\

+	"..\FL\Fl_Help_View.H"\

 	"..\fl\fl_scrollbar.h"\

 	"..\fl\fl_slider.h"\

 	"..\fl\fl_valuator.h"\

@@ -875,7 +927,7 @@ DEP_CPP_FL_HEL=\
 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

 	"..\fl\fl_group.h"\

-	"..\fl\fl_helpview.h"\

+	"..\FL\Fl_Help_View.H"\

 	"..\fl\fl_image.h"\

 	"..\fl\fl_pixmap.h"\

 	"..\fl\fl_scrollbar.h"\

@@ -1739,7 +1791,9 @@ DEP_CPP_FORMS=\
 	"..\fl\fl_dial.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

+	"..\FL\Fl_File_Browser.H"\

 	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_formsbitmap.h"\

 	"..\fl\fl_formspixmap.h"\

 	"..\fl\fl_free.h"\

@@ -1753,6 +1807,7 @@ DEP_CPP_FORMS=\
 	"..\fl\fl_menu_item.h"\

 	"..\fl\fl_pixmap.h"\

 	"..\fl\fl_positioner.h"\

+	"..\fl\fl_return_button.h"\

 	"..\fl\fl_round_button.h"\

 	"..\fl\fl_scrollbar.h"\

 	"..\fl\fl_show_colormap.h"\

@@ -1786,7 +1841,9 @@ DEP_CPP_FORMS_=\
 	"..\fl\fl_dial.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

+	"..\FL\Fl_File_Browser.H"\

 	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_formsbitmap.h"\

 	"..\fl\fl_formspixmap.h"\

 	"..\fl\fl_free.h"\

@@ -1846,7 +1903,9 @@ DEP_CPP_FORMS_FS=\
 	"..\fl\fl_dial.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

+	"..\FL\Fl_File_Browser.H"\

 	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_formsbitmap.h"\

 	"..\fl\fl_formspixmap.h"\

 	"..\fl\fl_free.h"\

@@ -1860,6 +1919,7 @@ DEP_CPP_FORMS_FS=\
 	"..\fl\fl_menu_item.h"\

 	"..\fl\fl_pixmap.h"\

 	"..\fl\fl_positioner.h"\

+	"..\fl\fl_return_button.h"\

 	"..\fl\fl_round_button.h"\

 	"..\fl\fl_scrollbar.h"\

 	"..\fl\fl_show_colormap.h"\

@@ -1893,7 +1953,9 @@ DEP_CPP_FORMS_P=\
 	"..\fl\fl_dial.h"\

 	"..\fl\fl_draw.h"\

 	"..\fl\fl_export.h"\

+	"..\FL\Fl_File_Browser.H"\

 	"..\fl\fl_file_chooser.h"\

+	"..\FL\Fl_File_Icon.H"\

 	"..\fl\fl_formsbitmap.h"\

 	"..\fl\fl_formspixmap.h"\

 	"..\fl\fl_free.h"\

@@ -1907,6 +1969,7 @@ DEP_CPP_FORMS_P=\
 	"..\fl\fl_menu_item.h"\

 	"..\fl\fl_pixmap.h"\

 	"..\fl\fl_positioner.h"\

+	"..\fl\fl_return_button.h"\

 	"..\fl\fl_round_button.h"\

 	"..\fl\fl_scrollbar.h"\

 	"..\fl\fl_show_colormap.h"\

@@ -1933,6 +1996,76 @@ DEP_CPP_FORMS_T=\
 # End Source File

 # Begin Source File

 

+SOURCE=..\src\gl_draw.cxx

+DEP_CPP_GL_DR=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_draw.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	"..\src\fl_font.h"\

+	"..\src\Fl_Gl_Choice.H"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\gl_start.cxx

+DEP_CPP_GL_ST=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_draw.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\win32.h"\

+	"..\fl\x.h"\

+	"..\src\Fl_Gl_Choice.H"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\glut_compatability.cxx

+DEP_CPP_GLUT_=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_gl_window.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_menu_item.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\glut.h"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

+SOURCE=..\src\glut_font.cxx

+DEP_CPP_GLUT_F=\

+	"..\fl\enumerations.h"\

+	"..\fl\fl.h"\

+	"..\fl\fl_export.h"\

+	"..\fl\fl_gl_window.h"\

+	"..\fl\fl_group.h"\

+	"..\fl\fl_widget.h"\

+	"..\fl\fl_window.h"\

+	"..\FL\gl.h"\

+	"..\fl\glut.h"\

+	".\config.h"\

+	

+# End Source File

+# Begin Source File

+

 SOURCE=..\src\numericsort.c

 DEP_CPP_NUMER=\

 	"..\fl\filename.h"\