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

[Miriam Ruiz]

Author: baby-guest
Date: 2006-10-07 16:55:28 +0000 (Sat, 07 Oct 2006)
New Revision: 1804

Added:
   packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch
Modified:
   packages/trunk/nikwi/debian/changelog
   packages/trunk/nikwi/debian/patches/makefiles.patch
   packages/trunk/nikwi/debian/patches/series
Log:
Removed rdtsc stuff for compatibility with other architectures.



Modified: packages/trunk/nikwi/debian/changelog
===================================================================
--- packages/trunk/nikwi/debian/changelog	2006-10-07 14:44:01 UTC (rev 1803)
+++ packages/trunk/nikwi/debian/changelog	2006-10-07 16:55:28 UTC (rev 1804)
@@ -1,5 +1,11 @@
-nikwi (0.0.20060823-1) UNRELEASED; urgency=low
+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)
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Thu, 28 Sep 2006 01:03:05 +0200

Modified: packages/trunk/nikwi/debian/patches/makefiles.patch
===================================================================
--- packages/trunk/nikwi/debian/patches/makefiles.patch	2006-10-07 14:44:01 UTC (rev 1803)
+++ packages/trunk/nikwi/debian/patches/makefiles.patch	2006-10-07 16:55:28 UTC (rev 1804)
@@ -253,3 +253,47 @@
 +	rm -f $(OUTPUT)
 +
 +.PHONY: clean distclean
+diff -ruN srcdist.orig/slashtdp/demo/Makefile.debian srcdist/slashtdp/demo/Makefile.debian
+--- srcdist.orig/slashtdp/demo/Makefile.debian	1970-01-01 01:00:00.000000000 +0100
++++ srcdist/slashtdp/demo/Makefile.debian	2006-10-07 18:37:16.000000000 +0200
+@@ -0,0 +1,40 @@
++OUTPUT = demo
++CC = g++
++LD = g++
++CFLAGS = -Wall -g3
++CPPFLAGS = 
++INCLUDES = -I../include
++LDFLAGS = -O 
++LIBS = -lSDL -L.. -lslashtdp
++
++CC = g++
++AR = ar
++
++OBJECTS = main.o
++HEADERS =
++
++$(OUTPUT): $(OBJECTS)
++	rm -f $(OUTPUT)
++	$(LD) $(OBJECTS) -o $(OUTPUT) $(LDFLAGS) $(LIBS)
++
++.SUFFIXES : .c .cc .cpp .C .S .o
++
++# object from C
++.c.o :  $< $(HEADERS)
++	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
++
++# object from C++ (.cc, .cpp, .C files)
++.cc.o .cpp.o .C.o : $< $(HEADERS)
++	$(CC) $(INCLUDES) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++
++# object from asm
++.S.o :
++	$(CC) $(ASMFLAGS) -c $< -o $@
++
++clean:
++	rm -f $(OBJECTS)
++
++distclean: clean
++	rm -f $(OUTPUT)
++
++.PHONY: clean distclean

Added: packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch
===================================================================
--- packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch	                        (rev 0)
+++ packages/trunk/nikwi/debian/patches/nikwideluxe_rdtsc.patch	2006-10-07 16:55:28 UTC (rev 1804)
@@ -0,0 +1,43 @@
+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 @@
+ */
+ 
+ #include "nikwi.h"
++#include <sys/times.h>
+ 
+ bool	running = true;
+ bool	debugMode = false;
+ int	debugCounter = 0;
+ 
+-extern "C" {
+-unsigned long	rdtsc_h;
+-unsigned long	rdtsc_l;
+-};
+-unsigned long long rdtsc()
+-{
+-	asm("rdtsc");
+-	#ifdef WIN32
+-	asm("movl %edx, _rdtsc_h");
+-	asm("movl %eax, _rdtsc_l");
+-	#else
+-	asm("movl %edx, rdtsc_h");
+-	asm("movl %eax, rdtsc_l");
+-	#endif
+-	return (((unsigned long long)rdtsc_h << 32)|rdtsc_l);
+-}
+-
+ static void timedTasks()
+ {
+ 	if (debugMode)
+ 	{
+-		unsigned long long	counter = rdtsc();
++		clock_t	counter = times(NULL);
+ 		activeScreen->timer();
+ 		char	buff[32];
+-		sprintf(buff, "Debug mode - %llu cycles", rdtsc()-counter);
++		sprintf(buff, "Debug mode - %llu cycles", times(NULL)-counter);
+ 		SDL_WM_SetCaption(buff, buff);
+ 	}
+ 	else

Modified: packages/trunk/nikwi/debian/patches/series
===================================================================
--- packages/trunk/nikwi/debian/patches/series	2006-10-07 14:44:01 UTC (rev 1803)
+++ packages/trunk/nikwi/debian/patches/series	2006-10-07 16:55:28 UTC (rev 1804)
@@ -1,5 +1,6 @@
 makefiles.patch -p0
 nikwideluxe_makedata.patch -p0
 nikwideluxe_nikio.patch -p0
+nikwideluxe_rdtsc.patch -p0
 slashfx_main.patch -p0
 uscript_type.patch -p0