r1812 - in packages/trunk/nikwi/debian: . patches

[Miriam Ruiz]

Author: baby-guest
Date: 2006-10-08 18:04:52 +0000 (Sun, 08 Oct 2006)
New Revision: 1812

Modified:
   packages/trunk/nikwi/debian/changelog
   packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch
Log:
Reordered code.



Modified: packages/trunk/nikwi/debian/changelog
===================================================================
--- packages/trunk/nikwi/debian/changelog	2006-10-08 13:07:24 UTC (rev 1811)
+++ packages/trunk/nikwi/debian/changelog	2006-10-08 18:04:52 UTC (rev 1812)
@@ -1,12 +1,8 @@
-nikwi (0.0.20060823-2) UNRELEASED; urgency=low
-
-  * Removed rdtsc stuff for compatibility with other architectures.
-
- -- Miriam Ruiz <little_miry at yahoo.es>  Sat,  7 Oct 2006 18:54:52 +0200
-
 nikwi (0.0.20060823-1) unstable; urgency=low
 
   * Initial release (Closes: #390073)
+  * Created build system based in standard make utility.
+  * Patched code so that data files can be stored in an absolute path.
+  * Removed rdtsc stuff for compatibility with other architectures.
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 28 Sep 2006 01:03:05 +0200
-

Modified: packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch
===================================================================
--- packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch	2006-10-08 13:07:24 UTC (rev 1811)
+++ packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch	2006-10-08 18:04:52 UTC (rev 1812)
@@ -1,7 +1,7 @@
 diff -ruN srcdist.orig/nikwideluxe/src/main.cpp srcdist/nikwideluxe/src/main.cpp
 --- srcdist.orig/nikwideluxe/src/main.cpp	2006-08-23 19:33:17.000000000 +0200
-+++ srcdist/nikwideluxe/src/main.cpp	2006-10-07 18:48:40.000000000 +0200
-@@ -25,36 +25,20 @@
++++ srcdist/nikwideluxe/src/main.cpp	2006-10-08 20:01:44.000000000 +0200
+@@ -25,36 +25,21 @@
  */
  
  #include "nikwi.h"
@@ -33,11 +33,12 @@
  	if (debugMode)
  	{
 -		unsigned long long	counter = rdtsc();
-+		clock_t	counter = times(NULL);
++		clock_t	time_ini = times(NULL);
  		activeScreen->timer();
  		char	buff[32];
 -		sprintf(buff, "Debug mode - %llu cycles", rdtsc()-counter);
-+		sprintf(buff, "Debug mode - %llu cycles", times(NULL)-counter);
++		clock_t time_inc = times(NULL) - time_ini;
++		sprintf(buff, "Debug mode - %llu.%02llu seconds", time_ini/100, time_ini%100);
  		SDL_WM_SetCaption(buff, buff);
  	}
  	else