[tuhopuu-devel] Patch for Linux build.

Jonathan Merritt tuhopuu-devel@blender.org
Thu, 03 Jun 2004 22:42:45 +1000


This is a multi-part message in MIME format.
--------------070106050103020806000609
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi Everyone,

Attached is a very small patch against the current CVS version of 
Tuhopuu to achieve a build under Linux.  I created this patch using:
    cvs diff -u > patch
in the tuhopuu2 directory.  Please let me know if a different diff 
command is more appropriate.

The things I changed to achieve the build:
    - Changed an #elif without a test to an #else.
    - Copied the values for
       BL_SENS_MOUSE_WHEEL_UP
       BL_SENS_MOUSE_WHEEL_DOWN
    from the main Blender CVS code.

Jonathan Merritt.

--------------070106050103020806000609
Content-Type: text/plain;
 name="patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch"

? blender
? config.opts
? patch
Index: source/blender/makesdna/DNA_sensor_types.h
===================================================================
RCS file: /cvsroot/tuhopuu/tuhopuu2/source/blender/makesdna/DNA_sensor_types.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DNA_sensor_types.h
--- source/blender/makesdna/DNA_sensor_types.h	10 Aug 2003 20:21:08 -0000	1.1.1.1
+++ source/blender/makesdna/DNA_sensor_types.h	3 Jun 2004 12:44:34 -0000
@@ -219,6 +219,8 @@
 #define BL_SENS_MOUSE_LEFT_BUTTON    1
 #define BL_SENS_MOUSE_MIDDLE_BUTTON  2
 #define BL_SENS_MOUSE_RIGHT_BUTTON   4
+#define BL_SENS_MOUSE_WHEEL_UP       5
+#define BL_SENS_MOUSE_WHEEL_DOWN     6
 #define BL_SENS_MOUSE_MOVEMENT       8
 #define BL_SENS_MOUSE_MOUSEOVER      16
 
Index: source/blender/src/editsima.c
===================================================================
RCS file: /cvsroot/tuhopuu/tuhopuu2/source/blender/src/editsima.c,v
retrieving revision 1.26
diff -u -r1.26 editsima.c
--- source/blender/src/editsima.c	25 May 2004 22:59:47 -0000	1.26
+++ source/blender/src/editsima.c	3 Jun 2004 12:44:44 -0000
@@ -551,7 +551,7 @@
 				else sprintf(str, "X: %.4f   Y: %.4f  LKEY LSCM live off", ivec[0], ivec[1]);
 
 				headerprint(str);
-#elif
+#else
 				sprintf(str, "X: %.4f   Y: %.4f  ", ivec[0], ivec[1]);
 				headerprint(str);
 #endif			

--------------070106050103020806000609--