Just updated
authorJim Grandpre <jim.tla@gmail.com>
Mon, 14 Jun 2010 01:46:08 -0400
changeset 465278f6e0b80d1e
parent 4651 86c171888eee
parent 4650 7ad7a473b086
child 4653 744b75ad18b8
Just updated
     1.1 --- a/VisualC/SDL.sln	Mon Jun 14 01:44:04 2010 -0400
     1.2 +++ b/VisualC/SDL.sln	Mon Jun 14 01:46:08 2010 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4 -Microsoft Visual Studio Solution File, Format Version 9.00
     1.5 -# Visual C++ Express 2005
     1.6 +Microsoft Visual Studio Solution File, Format Version 10.00
     1.7 +# Visual Studio 2008
     1.8  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
     1.9  EndProject
    1.10  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
     2.1 --- a/VisualC/SDL/SDL.vcproj	Mon Jun 14 01:44:04 2010 -0400
     2.2 +++ b/VisualC/SDL/SDL.vcproj	Mon Jun 14 01:46:08 2010 -0400
     2.3 @@ -1,10 +1,11 @@
     2.4  <?xml version="1.0" encoding="Windows-1252"?>
     2.5  <VisualStudioProject
     2.6  	ProjectType="Visual C++"
     2.7 -	Version="8.00"
     2.8 +	Version="9.00"
     2.9  	Name="SDL"
    2.10  	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
    2.11  	RootNamespace="SDL"
    2.12 +	TargetFrameworkVersion="131072"
    2.13  	>
    2.14  	<Platforms>
    2.15  		<Platform
    2.16 @@ -76,16 +77,21 @@
    2.17  			/>
    2.18  			<Tool
    2.19  				Name="VCLinkerTool"
    2.20 -				AdditionalOptions="/MACHINE:I386"
    2.21 +				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib"
    2.22  				AdditionalDependencies="msimg32.lib winmm.lib"
    2.23  				OutputFile=".\Debug/SDL.dll"
    2.24  				LinkIncremental="2"
    2.25  				SuppressStartupBanner="true"
    2.26 -				IgnoreAllDefaultLibraries="true"
    2.27 +				IgnoreAllDefaultLibraries="false"
    2.28 +				IgnoreDefaultLibraryNames=""
    2.29  				GenerateDebugInformation="true"
    2.30  				ProgramDatabaseFile=".\Debug/SDL.pdb"
    2.31 -				SubSystem="2"
    2.32 +				SubSystem="0"
    2.33 +				RandomizedBaseAddress="1"
    2.34 +				DataExecutionPrevention="0"
    2.35  				ImportLibrary=".\Debug/SDL.lib"
    2.36 +				Profile="true"
    2.37 +				CLRThreadAttribute="0"
    2.38  				CLRUnmanagedCodeCheck="false"
    2.39  			/>
    2.40  			<Tool
    2.41 @@ -107,9 +113,6 @@
    2.42  				Name="VCAppVerifierTool"
    2.43  			/>
    2.44  			<Tool
    2.45 -				Name="VCWebDeploymentTool"
    2.46 -			/>
    2.47 -			<Tool
    2.48  				Name="VCPostBuildEventTool"
    2.49  			/>
    2.50  		</Configuration>
    2.51 @@ -185,6 +188,8 @@
    2.52  				IgnoreAllDefaultLibraries="true"
    2.53  				ProgramDatabaseFile=".\Release/SDL.pdb"
    2.54  				SubSystem="2"
    2.55 +				RandomizedBaseAddress="1"
    2.56 +				DataExecutionPrevention="0"
    2.57  				ImportLibrary=".\Release/SDL.lib"
    2.58  			/>
    2.59  			<Tool
    2.60 @@ -206,9 +211,6 @@
    2.61  				Name="VCAppVerifierTool"
    2.62  			/>
    2.63  			<Tool
    2.64 -				Name="VCWebDeploymentTool"
    2.65 -			/>
    2.66 -			<Tool
    2.67  				Name="VCPostBuildEventTool"
    2.68  			/>
    2.69  		</Configuration>
    2.70 @@ -929,6 +931,14 @@
    2.71  			>
    2.72  		</File>
    2.73  		<File
    2.74 +			RelativePath="..\..\src\events\SDL_touch.c"
    2.75 +			>
    2.76 +		</File>
    2.77 +		<File
    2.78 +			RelativePath="..\..\src\events\SDL_touch_c.h"
    2.79 +			>
    2.80 +		</File>
    2.81 +		<File
    2.82  			RelativePath="..\..\src\video\SDL_video.c"
    2.83  			>
    2.84  		</File>
     3.1 --- a/VisualC/SDLmain/SDLmain.vcproj	Mon Jun 14 01:44:04 2010 -0400
     3.2 +++ b/VisualC/SDLmain/SDLmain.vcproj	Mon Jun 14 01:46:08 2010 -0400
     3.3 @@ -1,9 +1,10 @@
     3.4  <?xml version="1.0" encoding="Windows-1252"?>
     3.5  <VisualStudioProject
     3.6  	ProjectType="Visual C++"
     3.7 -	Version="8.00"
     3.8 +	Version="9.00"
     3.9  	Name="SDLmain"
    3.10  	ProjectGUID="{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}"
    3.11 +	TargetFrameworkVersion="131072"
    3.12  	>
    3.13  	<Platforms>
    3.14  		<Platform
    3.15 @@ -25,7 +26,7 @@
    3.16  			<Tool
    3.17  				Name="VCPreBuildEventTool"
    3.18  				Description="Making sure basic SDL headers are in place..."
    3.19 -				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
    3.20 +				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    3.21  			/>
    3.22  			<Tool
    3.23  				Name="VCCustomBuildTool"
    3.24 @@ -98,7 +99,7 @@
    3.25  			<Tool
    3.26  				Name="VCPreBuildEventTool"
    3.27  				Description="Making sure basic SDL headers are in place..."
    3.28 -				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
    3.29 +				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    3.30  			/>
    3.31  			<Tool
    3.32  				Name="VCCustomBuildTool"
    3.33 @@ -171,7 +172,7 @@
    3.34  			<Tool
    3.35  				Name="VCPreBuildEventTool"
    3.36  				Description="Making sure basic SDL headers are in place..."
    3.37 -				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY"
    3.38 +				CommandLine="if exist &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot; goto SDLCONFIGOKAY&#x0D;&#x0A;echo Copying SDL_config_win32.h to SDL_config.h...&#x0D;&#x0A;copy &quot;$(ProjectDir)\..\..\include\SDL_config_win32.h&quot; &quot;$(ProjectDir)\..\..\include\SDL_config.h&quot;&#x0D;&#x0A;:SDLCONFIGOKAY&#x0D;&#x0A;&#x0D;&#x0A;if exist &quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot; goto SDLREVISIONOKAY&#x0D;&#x0A;echo Creating stub SDL_revision.h file...&#x0D;&#x0A;echo #define SDL_REVISION 0 &gt;&quot;$(ProjectDir)\..\..\include\SDL_revision.h&quot;&#x0D;&#x0A;:SDLREVISIONOKAY&#x0D;&#x0A;"
    3.39  			/>
    3.40  			<Tool
    3.41  				Name="VCCustomBuildTool"
     4.1 --- a/include/SDL_touch.h	Mon Jun 14 01:44:04 2010 -0400
     4.2 +++ b/include/SDL_touch.h	Mon Jun 14 01:46:08 2010 -0400
     4.3 @@ -41,8 +41,6 @@
     4.4  /* *INDENT-ON* */
     4.5  #endif
     4.6  
     4.7 -typedef struct SDL_Touch SDL_Touch;
     4.8 -typedef struct SDL_Finger SDL_Finger;
     4.9  
    4.10  struct SDL_Finger {
    4.11    int id;
    4.12 @@ -55,9 +53,11 @@
    4.13    int pressure;
    4.14  };
    4.15  
    4.16 +typedef struct SDL_Touch SDL_Touch;
    4.17 +typedef struct SDL_Finger SDL_Finger;
    4.18  
    4.19 -struct SDL_Touch
    4.20 -{
    4.21 +
    4.22 +struct SDL_Touch {
    4.23    
    4.24    /* Free the touch when it's time */
    4.25    void (*FreeTouch) (SDL_Touch * touch);
    4.26 @@ -87,6 +87,7 @@
    4.27  };
    4.28  
    4.29  
    4.30 +
    4.31  /* Function prototypes */
    4.32  
    4.33  /**
     5.1 --- a/src/events/SDL_touch.c	Mon Jun 14 01:44:04 2010 -0400
     5.2 +++ b/src/events/SDL_touch.c	Mon Jun 14 01:46:08 2010 -0400
     5.3 @@ -27,6 +27,8 @@
     5.4  #include "SDL_events_c.h"
     5.5  #include "../video/SDL_sysvideo.h"
     5.6  
     5.7 +#include <stdio.h>
     5.8 +
     5.9  
    5.10  static int SDL_num_touch = 0;
    5.11  static SDL_Touch **SDL_touchPads = NULL;
    5.12 @@ -99,9 +101,7 @@
    5.13  SDL_AddTouch(const SDL_Touch * touch, char *name)
    5.14  {
    5.15      SDL_Touch **touchPads;
    5.16 -    int selected_touch;
    5.17 -    int index;
    5.18 -    size_t length;
    5.19 +    int index,length;
    5.20  
    5.21      if (SDL_GetTouchIndexId(touch->id) != -1) {
    5.22          SDL_SetError("Touch ID already in use");
    5.23 @@ -252,7 +252,6 @@
    5.24  {
    5.25      int index;
    5.26      SDL_Finger **fingers;
    5.27 -    size_t length;
    5.28      //printf("Adding Finger...\n");
    5.29      if (SDL_GetFingerIndexId(touch,finger->id) != -1) {
    5.30          SDL_SetError("Finger ID already in use");
    5.31 @@ -260,19 +259,18 @@
    5.32  
    5.33      /* Add the touch to the list of touch */
    5.34      if(touch->num_fingers  >= touch->max_fingers){
    5.35 -	printf("Making room for it!\n");
    5.36 -     	fingers = (SDL_Finger **) SDL_realloc(touch->fingers,
    5.37 -  		               (touch->num_fingers + 1) * sizeof(SDL_Finger *));
    5.38 -	touch->max_fingers = touch->num_fingers+1;
    5.39 -	if (!fingers) {
    5.40 -	    SDL_OutOfMemory();
    5.41 -	    return -1;
    5.42 -	} 
    5.43 -	else {
    5.44 -	    touch->max_fingers = touch->num_fingers+1;
    5.45 -	    touch->fingers = fingers;
    5.46 +		//printf("Making room for it!\n");
    5.47 +		fingers = (SDL_Finger **) SDL_realloc(touch->fingers,
    5.48 +  						   (touch->num_fingers + 1) * sizeof(SDL_Finger *));
    5.49 +		touch->max_fingers = touch->num_fingers+1;
    5.50 +		if (!fingers) {
    5.51 +			SDL_OutOfMemory();
    5.52 +			return -1;
    5.53 +		} else {
    5.54 +			touch->max_fingers = touch->num_fingers+1;
    5.55 +			touch->fingers = fingers;
    5.56 +		}
    5.57  	}
    5.58 -    }
    5.59  
    5.60      index = touch->num_fingers;
    5.61      //printf("Max_Fingers: %i Index: %i\n",touch->max_fingers,index);
    5.62 @@ -295,13 +293,14 @@
    5.63      SDL_Finger* finger = SDL_GetFinger(touch,fingerid);
    5.64  
    5.65      if (!finger) {
    5.66 -        return;
    5.67 +        return -1;
    5.68      }
    5.69   
    5.70  
    5.71      SDL_free(finger);
    5.72      touch->num_fingers--;
    5.73      touch->fingers[index] = touch->fingers[touch->num_fingers];
    5.74 +	return 0;
    5.75  }
    5.76  
    5.77  
    5.78 @@ -370,79 +369,80 @@
    5.79          return 0;
    5.80      }
    5.81  
    5.82 -    if(finger == NULL)
    5.83 -	SDL_SendFingerDown(id,fingerid,SDL_TRUE,x,y,pressure);
    5.84 -    else {
    5.85 -	/* the relative motion is calculated regarding the last position */
    5.86 -	if (relative) {
    5.87 -	    xrel = x;
    5.88 -	    yrel = y;
    5.89 -	    x = (finger->last_x + x);
    5.90 -	    y = (finger->last_y + y);
    5.91 +	if(finger == NULL) {
    5.92 +		SDL_SendFingerDown(id,fingerid,SDL_TRUE,x,y,pressure);
    5.93 +		return 0;
    5.94  	} else {
    5.95 -	    if(x < 0) x = finger->last_x; /*If movement is only in one axis,*/
    5.96 -	    if(y < 0) y = finger->last_y; /*The other is marked as -1*/
    5.97 -	    if(pressure < 0) pressure = finger->last_pressure;
    5.98 -	    xrel = x - finger->last_x;
    5.99 -	    yrel = y - finger->last_y;
   5.100 +		/* the relative motion is calculated regarding the last position */
   5.101 +		if (relative) {
   5.102 +			xrel = x;
   5.103 +			yrel = y;
   5.104 +			x = (finger->last_x + x);
   5.105 +			y = (finger->last_y + y);
   5.106 +		} else {
   5.107 +			if(x < 0) x = finger->last_x; /*If movement is only in one axis,*/
   5.108 +			if(y < 0) y = finger->last_y; /*The other is marked as -1*/
   5.109 +			if(pressure < 0) pressure = finger->last_pressure;
   5.110 +			xrel = x - finger->last_x;
   5.111 +			yrel = y - finger->last_y;
   5.112 +		}
   5.113 +		
   5.114 +		/* Drop events that don't change state */
   5.115 +		if (!xrel && !yrel) {
   5.116 +	#if 0
   5.117 +			printf("Touch event didn't change state - dropped!\n");
   5.118 +	#endif
   5.119 +			return 0;
   5.120 +		}
   5.121 +		
   5.122 +		/* Update internal touch coordinates */
   5.123 +		
   5.124 +		finger->x = x;
   5.125 +		finger->y = y;
   5.126 +		
   5.127 +		/*Should scale to window? Normalize? Maintain Aspect?*/
   5.128 +		//SDL_GetWindowSize(touch->focus, &x_max, &y_max);
   5.129 +		
   5.130 +		/* make sure that the pointers find themselves inside the windows */
   5.131 +		/* only check if touch->xmax is set ! */
   5.132 +		/*
   5.133 +		  if (x_max && touch->x > x_max) {
   5.134 +		  touch->x = x_max;
   5.135 +		  } else if (touch->x < 0) {
   5.136 +		  touch->x = 0;
   5.137 +		  }
   5.138 +		  
   5.139 +		  if (y_max && touch->y > y_max) {
   5.140 +		  touch->y = y_max;
   5.141 +		  } else if (touch->y < 0) {
   5.142 +		  touch->y = 0;
   5.143 +		  }
   5.144 +		*/
   5.145 +		finger->xdelta = xrel;
   5.146 +		finger->ydelta = yrel;
   5.147 +		finger->pressure = pressure;
   5.148 +		
   5.149 +		
   5.150 +		
   5.151 +		/* Post the event, if desired */
   5.152 +		posted = 0;
   5.153 +		if (SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) {
   5.154 +			SDL_Event event;
   5.155 +			event.tfinger.type = SDL_FINGERMOTION;
   5.156 +			event.tfinger.touchId = (Uint8) id;
   5.157 +			event.tfinger.fingerId = (Uint8) fingerid;
   5.158 +			event.tfinger.x = x;
   5.159 +			event.tfinger.y = y;
   5.160 +			event.tfinger.pressure = pressure;
   5.161 +			event.tfinger.state = touch->buttonstate;
   5.162 +			event.tfinger.windowID = touch->focus ? touch->focus->id : 0;
   5.163 +			posted = (SDL_PushEvent(&event) > 0);
   5.164 +		}
   5.165 +		finger->last_x = finger->x;
   5.166 +		finger->last_y = finger->y;
   5.167 +		finger->last_pressure = finger->pressure;
   5.168 +		return posted;
   5.169  	}
   5.170 -	
   5.171 -	/* Drop events that don't change state */
   5.172 -	if (!xrel && !yrel) {
   5.173 -#if 0
   5.174 -	    printf("Touch event didn't change state - dropped!\n");
   5.175 -#endif
   5.176 -	    return 0;
   5.177 -	}
   5.178 -	
   5.179 -	/* Update internal touch coordinates */
   5.180 -	
   5.181 -	finger->x = x;
   5.182 -	finger->y = y;
   5.183 -	
   5.184 -	/*Should scale to window? Normalize? Maintain Aspect?*/
   5.185 -	//SDL_GetWindowSize(touch->focus, &x_max, &y_max);
   5.186 -	
   5.187 -	/* make sure that the pointers find themselves inside the windows */
   5.188 -	/* only check if touch->xmax is set ! */
   5.189 -	/*
   5.190 -	  if (x_max && touch->x > x_max) {
   5.191 -	  touch->x = x_max;
   5.192 -	  } else if (touch->x < 0) {
   5.193 -	  touch->x = 0;
   5.194 -	  }
   5.195 -	  
   5.196 -	  if (y_max && touch->y > y_max) {
   5.197 -	  touch->y = y_max;
   5.198 -	  } else if (touch->y < 0) {
   5.199 -	  touch->y = 0;
   5.200 -	  }
   5.201 -	*/
   5.202 -	finger->xdelta = xrel;
   5.203 -	finger->ydelta = yrel;
   5.204 -	finger->pressure = pressure;
   5.205 -	
   5.206 -	
   5.207 -	
   5.208 -	/* Post the event, if desired */
   5.209 -	posted = 0;
   5.210 -	if (SDL_GetEventState(SDL_FINGERMOTION) == SDL_ENABLE) {
   5.211 -	    SDL_Event event;
   5.212 -	    event.tfinger.type = SDL_FINGERMOTION;
   5.213 -	    event.tfinger.touchId = (Uint8) id;
   5.214 -	    event.tfinger.fingerId = (Uint8) fingerid;
   5.215 -	    event.tfinger.x = x;
   5.216 -	    event.tfinger.y = y;
   5.217 -	    event.tfinger.pressure = pressure;
   5.218 -	    event.tfinger.state = touch->buttonstate;
   5.219 -	    event.tfinger.windowID = touch->focus ? touch->focus->id : 0;
   5.220 -	    posted = (SDL_PushEvent(&event) > 0);
   5.221 -	}
   5.222 -	finger->last_x = finger->x;
   5.223 -	finger->last_y = finger->y;
   5.224 -	finger->last_pressure = finger->pressure;
   5.225 -	return posted;
   5.226 -    }
   5.227  }
   5.228  int
   5.229  SDL_SendTouchButton(int id, Uint8 state, Uint8 button)
   5.230 @@ -483,7 +483,7 @@
   5.231      if (SDL_GetEventState(type) == SDL_ENABLE) {
   5.232          SDL_Event event;
   5.233          event.type = type;
   5.234 -        event.tbutton.touchId = (Uint8) index;
   5.235 +        event.tbutton.touchId = (Uint8) touch->id;
   5.236          event.tbutton.state = state;
   5.237          event.tbutton.button = button;
   5.238          event.tbutton.windowID = touch->focus ? touch->focus->id : 0;
     6.1 --- a/src/events/SDL_touch_c.h	Mon Jun 14 01:44:04 2010 -0400
     6.2 +++ b/src/events/SDL_touch_c.h	Mon Jun 14 01:46:08 2010 -0400
     6.3 @@ -64,8 +64,11 @@
     6.4  /* Shutdown the touch subsystem */
     6.5  extern void SDL_TouchQuit(void);
     6.6  
     6.7 -/* FIXME: Where do these functions go in this header? */
     6.8 -extern void SDL_ChangeEnd(int id, int end);
     6.9 +/* Get the index of a touch device */
    6.10 +extern int SDL_GetTouchIndexId(int id);
    6.11 +
    6.12 +
    6.13 +
    6.14  
    6.15  #endif /* _SDL_touch_c_h */
    6.16  
     7.1 --- a/src/video/win32/SDL_win32events.c	Mon Jun 14 01:44:04 2010 -0400
     7.2 +++ b/src/video/win32/SDL_win32events.c	Mon Jun 14 01:46:08 2010 -0400
     7.3 @@ -20,9 +20,9 @@
     7.4      slouken@libsdl.org
     7.5  */
     7.6  
     7.7 -#if (_WIN32_WINNT < 0x0501)
     7.8 +#if (_WIN32_WINNT < 0x601)
     7.9  #undef _WIN32_WINNT
    7.10 -#define _WIN32_WINNT 0x0501
    7.11 +#define _WIN32_WINNT 0x601
    7.12  #endif
    7.13  
    7.14  #include "SDL_config.h"
    7.15 @@ -32,11 +32,14 @@
    7.16  #include "SDL_vkeys.h"
    7.17  #include "../../events/SDL_events_c.h"
    7.18  
    7.19 -/*#define WMMSG_DEBUG*/
    7.20 +
    7.21 +
    7.22 +#define WMMSG_DEBUG
    7.23  #ifdef WMMSG_DEBUG
    7.24 -#include <stdio.h>
    7.25 +#include <stdio.h>	
    7.26  #include "wmmsg.h"
    7.27  #endif
    7.28 +//#include <stdio.h>
    7.29  
    7.30  /* Masks for processing the windows KEYDOWN and KEYUP messages */
    7.31  #define REPEATED_KEYMASK    (1<<30)
    7.32 @@ -125,9 +128,10 @@
    7.33      if (!data) {
    7.34          return CallWindowProc(DefWindowProc, hwnd, msg, wParam, lParam);
    7.35      }
    7.36 +
    7.37  #ifdef WMMSG_DEBUG
    7.38 -    {
    7.39 -        FILE *log = fopen("wmmsg.txt", "a");
    7.40 +    {		
    7.41 +        FILE *log = fopen("wmmsg.txt", "a");		
    7.42          fprintf(log, "Received windows message: %p ", hwnd);
    7.43          if (msg > MAX_WMMSG) {
    7.44              fprintf(log, "%d", msg);
    7.45 @@ -643,7 +647,39 @@
    7.46          }
    7.47          returnCode = 0;
    7.48          break;
    7.49 -    }
    7.50 +	case WM_TOUCH:
    7.51 +		{
    7.52 +			//printf("Got Touch Event!\n");
    7.53 +    
    7.54 +			FILE *log = fopen("wmmsg.txt", "a");
    7.55 +			fprintf(log, "Received Touch Message: %p ", hwnd);
    7.56 +			if (msg > MAX_WMMSG) {
    7.57 +				fprintf(log, "%d", msg);
    7.58 +			} else {
    7.59 +				fprintf(log, "%s", wmtab[msg]);
    7.60 +			}
    7.61 +			fprintf(log, "WM_TOUCH = %d -- 0x%X, 0x%X\n",msg, wParam, lParam);
    7.62 +			fclose(log);
    7.63 +    
    7.64 +		}
    7.65 +		break;
    7.66 +	case WM_GESTURE:
    7.67 +		{
    7.68 +			//printf("Got Touch Event!\n");
    7.69 +    
    7.70 +			FILE *log = fopen("wmmsg.txt", "a");
    7.71 +			fprintf(log, "Received Gesture Message: %p ", hwnd);
    7.72 +			if (msg > MAX_WMMSG) {
    7.73 +				fprintf(log, "%d", msg);
    7.74 +			} else {
    7.75 +				fprintf(log, "%s", wmtab[msg]);
    7.76 +			}
    7.77 +			fprintf(log, "WM_GESTURE = %d -- 0x%X, 0x%X\n",msg, wParam, lParam);
    7.78 +			fclose(log);
    7.79 +    
    7.80 +		}
    7.81 +		break;		
    7.82 +	}
    7.83  
    7.84      /* If there's a window proc, assume it's going to handle messages */
    7.85      if (data->wndproc) {
     8.1 --- a/src/video/win32/SDL_win32video.h	Mon Jun 14 01:44:04 2010 -0400
     8.2 +++ b/src/video/win32/SDL_win32video.h	Mon Jun 14 01:46:08 2010 -0400
     8.3 @@ -30,7 +30,14 @@
     8.4  #define STRICT
     8.5  #define UNICODE
     8.6  #undef WINVER
     8.7 -#define WINVER  0x500           /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
     8.8 +//#define WINVER  0x500           /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
     8.9 +#define WINVER 0x601  /* Need 0x600 (_WIN32_WINNT_WIN7) for WM_Touch */
    8.10 +#if (_WIN32_WINNT < 0x601)
    8.11 +#undef _WIN32_WINNT
    8.12 +#define _WIN32_WINNT 0x601
    8.13 +#endif
    8.14 +
    8.15 +
    8.16  #include <windows.h>
    8.17  
    8.18  #if SDL_VIDEO_RENDER_D3D
     9.1 --- a/src/video/win32/SDL_win32window.c	Mon Jun 14 01:44:04 2010 -0400
     9.2 +++ b/src/video/win32/SDL_win32window.c	Mon Jun 14 01:46:08 2010 -0400
     9.3 @@ -256,7 +256,8 @@
     9.4          WIN_SetError("Couldn't create window");
     9.5          return -1;
     9.6      }
     9.7 -
     9.8 +	/*Disable Tablet support, replace with multi-touch.*/
     9.9 +#if 0 
    9.10      /* we're configuring the tablet data. See Wintab reference for more info */
    9.11      if (videodata->wintabDLL
    9.12          && videodata->WTInfoA(WTI_DEFSYSCTX, 0, &lc) != 0) {
    9.13 @@ -290,6 +291,9 @@
    9.14          }
    9.15          g_hCtx[window->id] = videodata->WTOpenA(hwnd, &lc, TRUE);
    9.16      }
    9.17 +#else 
    9.18 +	//RegisterTouchWindow(hwnd, 0);
    9.19 +#endif 
    9.20  #ifndef _WIN32_WCE              /* has no RawInput */
    9.21      /* we're telling the window, we want it to report raw input events from mice */
    9.22      Rid.usUsagePage = 0x01;
    10.1 --- a/src/video/win32/wmmsg.h	Mon Jun 14 01:44:04 2010 -0400
    10.2 +++ b/src/video/win32/wmmsg.h	Mon Jun 14 01:46:08 2010 -0400
    10.3 @@ -283,7 +283,7 @@
    10.4      "WM_INITMENU",
    10.5      "WM_INITMENUPOPUP",
    10.6      "UNKNOWN (280)",
    10.7 -    "UNKNOWN (281)",
    10.8 +    "WM_GESTURE",
    10.9      "UNKNOWN (282)",
   10.10      "UNKNOWN (283)",
   10.11      "UNKNOWN (284)",
   10.12 @@ -578,7 +578,7 @@
   10.13      "UNKNOWN (573)",
   10.14      "UNKNOWN (574)",
   10.15      "UNKNOWN (575)",
   10.16 -    "UNKNOWN (576)",
   10.17 +    "WM_TOUCH",
   10.18      "UNKNOWN (577)",
   10.19      "UNKNOWN (578)",
   10.20      "UNKNOWN (579)",
    11.1 --- a/touchTest/touchTest.c	Mon Jun 14 01:44:04 2010 -0400
    11.2 +++ b/touchTest/touchTest.c	Mon Jun 14 01:46:08 2010 -0400
    11.3 @@ -3,6 +3,8 @@
    11.4  #include <math.h>
    11.5  #include <SDL_touch.h>
    11.6  
    11.7 +
    11.8 +
    11.9  #define PI 3.1415926535897
   11.10  #define WIDTH 640
   11.11  #define HEIGHT 480
   11.12 @@ -32,7 +34,7 @@
   11.13  
   11.14  void handler (int sig)
   11.15  {
   11.16 -  printf ("\exiting...(%d)\n", sig);
   11.17 +  printf ("exiting...(%d)\n", sig);
   11.18    exit (0);
   11.19  }
   11.20  
   11.21 @@ -53,7 +55,7 @@
   11.22  
   11.23    colour = SDL_MapRGB( screen->format, (col>>16)&0xFF, (col>>8)&0xFF, col&0xFF);
   11.24    
   11.25 -  pixmem32 = (Uint32*) screen->pixels  + y*screen->pitch/BPP + x;
   11.26 +  pixmem32 = (Uint32*) screen->pixels  + y*screen->pitch/screen->format->BytesPerPixel + x; //TODO : Check this. May cause crash.
   11.27    *pixmem32 = colour;
   11.28  }
   11.29  
   11.30 @@ -81,7 +83,7 @@
   11.31  
   11.32  void DrawScreen(SDL_Surface* screen, int h)
   11.33  {
   11.34 -  int x, y, xm,ym,c;
   11.35 +  int x, y, xm,ym,c,i;
   11.36    if(SDL_MUSTLOCK(screen))
   11.37      {                                              
   11.38        if(SDL_LockSurface(screen) < 0) return;
   11.39 @@ -98,9 +100,10 @@
   11.40  	  setpix(screen,x,y,((x%255)<<16) + ((y%255)<<8) + (x+y)%255);
   11.41          }
   11.42      }
   11.43 +
   11.44    drawCircle(screen,mousx,mousy,-30,0xFFFFFF);
   11.45    
   11.46 -  int i;
   11.47 +  
   11.48    for(i=0;i<MAXFINGERS;i++)
   11.49      if(finger[i].p.x >= 0 && finger[i].p.y >= 0)
   11.50        if(finger[i].pressure > 0)
   11.51 @@ -131,8 +134,8 @@
   11.52  
   11.53    memset(keystat,0,512*sizeof(keystat[0]));
   11.54    if (SDL_Init(SDL_INIT_VIDEO) < 0 ) return 1;
   11.55 -  
   11.56 -  if (!(screen = initScreen(WIDTH,HEIGHT)))
   11.57 +  screen = initScreen(WIDTH,HEIGHT);
   11.58 +  if (!screen)
   11.59      {
   11.60        SDL_Quit();
   11.61        return 1;
   11.62 @@ -179,21 +182,22 @@
   11.63  	    ;
   11.64  	    //printf("Finger: %i,x: %i, y: %i\n",event.tfinger.fingerId,
   11.65  	    //	   event.tfinger.x,event.tfinger.y);
   11.66 -	    SDL_Touch* inTouch = SDL_GetTouch(event.tfinger.touchId);
   11.67 -	    SDL_Finger* inFinger = SDL_GetFinger(inTouch,event.tfinger.fingerId);
   11.68 -	    
   11.69 +	    //SDL_Touch *inTouch = SDL_GetTouch(event.tfinger.touchId);
   11.70 +	    //SDL_Finger *inFinger = SDL_GetFinger(inTouch,event.tfinger.fingerId);
   11.71 +	    /*
   11.72  	    finger[event.tfinger.fingerId].p.x = ((float)event.tfinger.x)/
   11.73  	      inTouch->xres;
   11.74  	    finger[event.tfinger.fingerId].p.y = ((float)event.tfinger.y)/
   11.75  	      inTouch->yres;
   11.76  
   11.77  	    finger[event.tfinger.fingerId].pressure = 
   11.78 -	      ((float)event.tfinger.pressure)/inTouch->pressureres;
   11.79 -
   11.80 +	      ((float)event.tfinger.pressure)/inTouch->pressureres;*/
   11.81 +		/*
   11.82  	    printf("Finger: %i, Pressure: %f Pressureres: %i\n",
   11.83  		   event.tfinger.fingerId,
   11.84  		   finger[event.tfinger.fingerId].pressure,
   11.85  		   inTouch->pressureres);
   11.86 +		   */
   11.87  	    //printf("Finger: %i, pressure: %f\n",event.tfinger.fingerId,
   11.88  	    //   finger[event.tfinger.fingerId].pressure);
   11.89  
   11.90 @@ -215,6 +219,7 @@
   11.91        }
   11.92      //And draw
   11.93      DrawScreen(screen,h);
   11.94 +	printf("Things\n");
   11.95      /*
   11.96        for(i=0;i<512;i++) 
   11.97        if(keystat[i]) printf("%i\n",i);
    12.1 Binary file touchTest/touchTest2/touchTest2.ncb has changed
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/touchTest/touchTest2/touchTest2.sln	Mon Jun 14 01:46:08 2010 -0400
    13.3 @@ -0,0 +1,20 @@
    13.4 +
    13.5 +Microsoft Visual Studio Solution File, Format Version 10.00
    13.6 +# Visual Studio 2008
    13.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touchTest2", "touchTest2\touchTest2.vcproj", "{42BC83F1-CF20-4CEC-AC81-12EA804639E2}"
    13.8 +EndProject
    13.9 +Global
   13.10 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
   13.11 +		Debug|Win32 = Debug|Win32
   13.12 +		Release|Win32 = Release|Win32
   13.13 +	EndGlobalSection
   13.14 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
   13.15 +		{42BC83F1-CF20-4CEC-AC81-12EA804639E2}.Debug|Win32.ActiveCfg = Debug|Win32
   13.16 +		{42BC83F1-CF20-4CEC-AC81-12EA804639E2}.Debug|Win32.Build.0 = Debug|Win32
   13.17 +		{42BC83F1-CF20-4CEC-AC81-12EA804639E2}.Release|Win32.ActiveCfg = Release|Win32
   13.18 +		{42BC83F1-CF20-4CEC-AC81-12EA804639E2}.Release|Win32.Build.0 = Release|Win32
   13.19 +	EndGlobalSection
   13.20 +	GlobalSection(SolutionProperties) = preSolution
   13.21 +		HideSolutionNode = FALSE
   13.22 +	EndGlobalSection
   13.23 +EndGlobal
    14.1 Binary file touchTest/touchTest2/touchTest2.suo has changed
    15.1 Binary file touchTest/touchTest2/touchTest2/SDL.dll has changed
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/touchTest/touchTest2/touchTest2/touchTest2.vcproj	Mon Jun 14 01:46:08 2010 -0400
    16.3 @@ -0,0 +1,195 @@
    16.4 +<?xml version="1.0" encoding="Windows-1252"?>
    16.5 +<VisualStudioProject
    16.6 +	ProjectType="Visual C++"
    16.7 +	Version="9.00"
    16.8 +	Name="touchTest2"
    16.9 +	ProjectGUID="{42BC83F1-CF20-4CEC-AC81-12EA804639E2}"
   16.10 +	RootNamespace="touchTest2"
   16.11 +	TargetFrameworkVersion="196613"
   16.12 +	>
   16.13 +	<Platforms>
   16.14 +		<Platform
   16.15 +			Name="Win32"
   16.16 +		/>
   16.17 +	</Platforms>
   16.18 +	<ToolFiles>
   16.19 +	</ToolFiles>
   16.20 +	<Configurations>
   16.21 +		<Configuration
   16.22 +			Name="Debug|Win32"
   16.23 +			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
   16.24 +			IntermediateDirectory="$(ConfigurationName)"
   16.25 +			ConfigurationType="1"
   16.26 +			CharacterSet="0"
   16.27 +			>
   16.28 +			<Tool
   16.29 +				Name="VCPreBuildEventTool"
   16.30 +			/>
   16.31 +			<Tool
   16.32 +				Name="VCCustomBuildTool"
   16.33 +			/>
   16.34 +			<Tool
   16.35 +				Name="VCXMLDataGeneratorTool"
   16.36 +			/>
   16.37 +			<Tool
   16.38 +				Name="VCWebServiceProxyGeneratorTool"
   16.39 +			/>
   16.40 +			<Tool
   16.41 +				Name="VCMIDLTool"
   16.42 +			/>
   16.43 +			<Tool
   16.44 +				Name="VCCLCompilerTool"
   16.45 +				Optimization="0"
   16.46 +				MinimalRebuild="true"
   16.47 +				BasicRuntimeChecks="3"
   16.48 +				RuntimeLibrary="3"
   16.49 +				WarningLevel="3"
   16.50 +				DebugInformationFormat="4"
   16.51 +			/>
   16.52 +			<Tool
   16.53 +				Name="VCManagedResourceCompilerTool"
   16.54 +			/>
   16.55 +			<Tool
   16.56 +				Name="VCResourceCompilerTool"
   16.57 +			/>
   16.58 +			<Tool
   16.59 +				Name="VCPreLinkEventTool"
   16.60 +			/>
   16.61 +			<Tool
   16.62 +				Name="VCLinkerTool"
   16.63 +				AdditionalOptions="C:\programs\gsoc10\VisualC\SDL\Debug\SDL.lib&#x0D;&#x0A;C:\programs\gsoc10\VisualC\SDLmain\Debug\SDLmain.lib&#x0D;&#x0A;msvcrt.lib&#x0D;&#x0A;"
   16.64 +				IgnoreAllDefaultLibraries="true"
   16.65 +				GenerateDebugInformation="true"
   16.66 +				SubSystem="2"
   16.67 +				TargetMachine="1"
   16.68 +			/>
   16.69 +			<Tool
   16.70 +				Name="VCALinkTool"
   16.71 +			/>
   16.72 +			<Tool
   16.73 +				Name="VCManifestTool"
   16.74 +			/>
   16.75 +			<Tool
   16.76 +				Name="VCXDCMakeTool"
   16.77 +			/>
   16.78 +			<Tool
   16.79 +				Name="VCBscMakeTool"
   16.80 +			/>
   16.81 +			<Tool
   16.82 +				Name="VCFxCopTool"
   16.83 +			/>
   16.84 +			<Tool
   16.85 +				Name="VCAppVerifierTool"
   16.86 +			/>
   16.87 +			<Tool
   16.88 +				Name="VCPostBuildEventTool"
   16.89 +			/>
   16.90 +		</Configuration>
   16.91 +		<Configuration
   16.92 +			Name="Release|Win32"
   16.93 +			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
   16.94 +			IntermediateDirectory="$(ConfigurationName)"
   16.95 +			ConfigurationType="1"
   16.96 +			CharacterSet="2"
   16.97 +			WholeProgramOptimization="1"
   16.98 +			>
   16.99 +			<Tool
  16.100 +				Name="VCPreBuildEventTool"
  16.101 +			/>
  16.102 +			<Tool
  16.103 +				Name="VCCustomBuildTool"
  16.104 +			/>
  16.105 +			<Tool
  16.106 +				Name="VCXMLDataGeneratorTool"
  16.107 +			/>
  16.108 +			<Tool
  16.109 +				Name="VCWebServiceProxyGeneratorTool"
  16.110 +			/>
  16.111 +			<Tool
  16.112 +				Name="VCMIDLTool"
  16.113 +			/>
  16.114 +			<Tool
  16.115 +				Name="VCCLCompilerTool"
  16.116 +				Optimization="2"
  16.117 +				EnableIntrinsicFunctions="true"
  16.118 +				RuntimeLibrary="2"
  16.119 +				EnableFunctionLevelLinking="true"
  16.120 +				WarningLevel="3"
  16.121 +				DebugInformationFormat="3"
  16.122 +			/>
  16.123 +			<Tool
  16.124 +				Name="VCManagedResourceCompilerTool"
  16.125 +			/>
  16.126 +			<Tool
  16.127 +				Name="VCResourceCompilerTool"
  16.128 +			/>
  16.129 +			<Tool
  16.130 +				Name="VCPreLinkEventTool"
  16.131 +			/>
  16.132 +			<Tool
  16.133 +				Name="VCLinkerTool"
  16.134 +				GenerateDebugInformation="true"
  16.135 +				OptimizeReferences="2"
  16.136 +				EnableCOMDATFolding="2"
  16.137 +				TargetMachine="1"
  16.138 +			/>
  16.139 +			<Tool
  16.140 +				Name="VCALinkTool"
  16.141 +			/>
  16.142 +			<Tool
  16.143 +				Name="VCManifestTool"
  16.144 +			/>
  16.145 +			<Tool
  16.146 +				Name="VCXDCMakeTool"
  16.147 +			/>
  16.148 +			<Tool
  16.149 +				Name="VCBscMakeTool"
  16.150 +			/>
  16.151 +			<Tool
  16.152 +				Name="VCFxCopTool"
  16.153 +			/>
  16.154 +			<Tool
  16.155 +				Name="VCAppVerifierTool"
  16.156 +			/>
  16.157 +			<Tool
  16.158 +				Name="VCPostBuildEventTool"
  16.159 +			/>
  16.160 +		</Configuration>
  16.161 +	</Configurations>
  16.162 +	<References>
  16.163 +	</References>
  16.164 +	<Files>
  16.165 +		<Filter
  16.166 +			Name="Source Files"
  16.167 +			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
  16.168 +			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
  16.169 +			>
  16.170 +			<File
  16.171 +				RelativePath="..\..\touchTest.c"
  16.172 +				>
  16.173 +			</File>
  16.174 +		</Filter>
  16.175 +		<Filter
  16.176 +			Name="Header Files"
  16.177 +			Filter="h;hpp;hxx;hm;inl;inc;xsd"
  16.178 +			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
  16.179 +			>
  16.180 +		</Filter>
  16.181 +		<Filter
  16.182 +			Name="Resource Files"
  16.183 +			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
  16.184 +			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
  16.185 +			>
  16.186 +			<File
  16.187 +				RelativePath=".\SDL.dll"
  16.188 +				>
  16.189 +			</File>
  16.190 +			<File
  16.191 +				RelativePath=".\wmmsg.txt"
  16.192 +				>
  16.193 +			</File>
  16.194 +		</Filter>
  16.195 +	</Files>
  16.196 +	<Globals>
  16.197 +	</Globals>
  16.198 +</VisualStudioProject>
    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/touchTest/touchTest2/touchTest2/touchTest2.vcproj.jgran-virtualPC.jgran.user	Mon Jun 14 01:46:08 2010 -0400
    17.3 @@ -0,0 +1,65 @@
    17.4 +<?xml version="1.0" encoding="Windows-1252"?>
    17.5 +<VisualStudioUserFile
    17.6 +	ProjectType="Visual C++"
    17.7 +	Version="9.00"
    17.8 +	ShowAllFiles="false"
    17.9 +	>
   17.10 +	<Configurations>
   17.11 +		<Configuration
   17.12 +			Name="Debug|Win32"
   17.13 +			>
   17.14 +			<DebugSettings
   17.15 +				Command="$(TargetPath)"
   17.16 +				WorkingDirectory=""
   17.17 +				CommandArguments=""
   17.18 +				Attach="false"
   17.19 +				DebuggerType="3"
   17.20 +				Remote="1"
   17.21 +				RemoteMachine="JGRAN-VIRTUALPC"
   17.22 +				RemoteCommand=""
   17.23 +				HttpUrl=""
   17.24 +				PDBPath=""
   17.25 +				SQLDebugging=""
   17.26 +				Environment=""
   17.27 +				EnvironmentMerge="true"
   17.28 +				DebuggerFlavor=""
   17.29 +				MPIRunCommand=""
   17.30 +				MPIRunArguments=""
   17.31 +				MPIRunWorkingDirectory=""
   17.32 +				ApplicationCommand=""
   17.33 +				ApplicationArguments=""
   17.34 +				ShimCommand=""
   17.35 +				MPIAcceptMode=""
   17.36 +				MPIAcceptFilter=""
   17.37 +			/>
   17.38 +		</Configuration>
   17.39 +		<Configuration
   17.40 +			Name="Release|Win32"
   17.41 +			>
   17.42 +			<DebugSettings
   17.43 +				Command="$(TargetPath)"
   17.44 +				WorkingDirectory=""
   17.45 +				CommandArguments=""
   17.46 +				Attach="false"
   17.47 +				DebuggerType="3"
   17.48 +				Remote="1"
   17.49 +				RemoteMachine="JGRAN-VIRTUALPC"
   17.50 +				RemoteCommand=""
   17.51 +				HttpUrl=""
   17.52 +				PDBPath=""
   17.53 +				SQLDebugging=""
   17.54 +				Environment=""
   17.55 +				EnvironmentMerge="true"
   17.56 +				DebuggerFlavor=""
   17.57 +				MPIRunCommand=""
   17.58 +				MPIRunArguments=""
   17.59 +				MPIRunWorkingDirectory=""
   17.60 +				ApplicationCommand=""
   17.61 +				ApplicationArguments=""
   17.62 +				ShimCommand=""
   17.63 +				MPIAcceptMode=""
   17.64 +				MPIAcceptFilter=""
   17.65 +			/>
   17.66 +		</Configuration>
   17.67 +	</Configurations>
   17.68 +</VisualStudioUserFile>