From a61a8d8cf78b61f08ce17201f3cf497355ea931d Mon Sep 17 00:00:00 2001 From: fayjf Date: Sat, 4 Feb 2012 05:01:29 +0000 Subject: [PATCH] Moving the "\freeglut_xinput.c" file from the Common directory to the x11 directory and adding the "_x11" to the end of the file name git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1035 7f0cb862-5218-0410-a997-914c9d46530a --- .gitattributes | 2 +- freeglut/freeglut/src/Makefile.am | 4 ++-- .../{Common/freeglut_xinput.c => x11/freeglut_xinput_x11.c} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename freeglut/freeglut/src/{Common/freeglut_xinput.c => x11/freeglut_xinput_x11.c} (100%) diff --git a/.gitattributes b/.gitattributes index 04b2fae..c019c74 100644 --- a/.gitattributes +++ b/.gitattributes @@ -150,7 +150,6 @@ freeglut/freeglut/src/Common/freeglut_teapot.c -text freeglut/freeglut/src/Common/freeglut_teapot_data.h -text freeglut/freeglut/src/Common/freeglut_videoresize.c -text freeglut/freeglut/src/Common/freeglut_window.c -text -freeglut/freeglut/src/Common/freeglut_xinput.c -text freeglut/freeglut/src/Common/freeglutdll.def -text freeglut/freeglut/src/Makefile.am svn_keywords=Author+Date+Id+Revision freeglut/freeglut/src/mswin/freeglut_cursor_mswin.c -text @@ -184,6 +183,7 @@ freeglut/freeglut/src/x11/freeglut_spaceball_x11.c -text freeglut/freeglut/src/x11/freeglut_state_x11.c -text freeglut/freeglut/src/x11/freeglut_structure_x11.c -text freeglut/freeglut/src/x11/freeglut_window_x11.c -text +freeglut/freeglut/src/x11/freeglut_xinput_x11.c -text freeglut/web-src/basic_page.php svn_keywords=Author+Date+Id+Revision freeglut/web-src/docs/api.php svn_keywords=Author+Date+Id+Revision freeglut/web-src/docs/install.php svn_keywords=Author+Date+Id+Revision diff --git a/freeglut/freeglut/src/Makefile.am b/freeglut/freeglut/src/Makefile.am index 533e84c..893626c 100644 --- a/freeglut/freeglut/src/Makefile.am +++ b/freeglut/freeglut/src/Makefile.am @@ -39,7 +39,6 @@ lib@LIBRARY@_la_SOURCES = Common/freeglut_callbacks.c \ Common/freeglut_teapot.c \ Common/freeglut_videoresize.c \ Common/freeglut_window.c \ - Common/freeglut_xinput.c \ x11/freeglut_cursor_x11.c \ x11/freeglut_display_x11.c \ x11/freeglut_ext_x11.c \ @@ -53,7 +52,8 @@ lib@LIBRARY@_la_SOURCES = Common/freeglut_callbacks.c \ x11/freeglut_spaceball_x11.c \ x11/freeglut_state_x11.c \ x11/freeglut_structure_x11.c \ - x11/freeglut_window_x11.c + x11/freeglut_window_x11.c \ + x11/freeglut_xinput_x11.c # # Additional linker flags diff --git a/freeglut/freeglut/src/Common/freeglut_xinput.c b/freeglut/freeglut/src/x11/freeglut_xinput_x11.c similarity index 100% rename from freeglut/freeglut/src/Common/freeglut_xinput.c rename to freeglut/freeglut/src/x11/freeglut_xinput_x11.c