From ed6a243f186a741f07202e11d2e60431c79e21a7 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Mon, 20 Sep 2010 14:57:43 +0200 Subject: [PATCH] don't build mmx_cmod since it ain't speeding up anything (and it's x86-only btw) --- build/build-x86.bat | 2 +- src/fe-gtk/makefile.mak | 4 ---- src/makefile.mak | 1 - src/makeinc.skel | 7 ------- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/build/build-x86.bat b/build/build-x86.bat index 981f7150..58e9388e 100644 --- a/build/build-x86.bat +++ b/build/build-x86.bat @@ -4,7 +4,7 @@ type makeinc.skel > makeinc.mak set INCLUDE=c:\WinDDK\7600.16385.1\inc\api;c:\WinDDK\7600.16385.1\inc\crt;c:\WinDDK\7600.16385.1\inc\api\crt\stl70;c:\mozilla-build\build\xchat-dev32\include set LIB=c:\WinDDK\7600.16385.1\lib\wxp\i386;c:\WinDDK\7600.16385.1\lib\Crt\i386 set OPATH=%PATH% -set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin;c:\mozilla-build\mingw32\bin +set PATH=c:\WinDDK\7600.16385.1\bin\x86\x86;c:\WinDDK\7600.16385.1\bin\x86;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE;c:\mozilla-build\build\xchat-dev32\bin nmake /nologo /f makefile.mak clean cd pixmaps nmake /nologo /f makefile.mak diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak index e3d1f972..4b1f1a21 100644 --- a/src/fe-gtk/makefile.mak +++ b/src/fe-gtk/makefile.mak @@ -11,9 +11,6 @@ PROG = xchat.exe all: $(PROG) -mmx_cmod.o: mmx_cmod.S - gcc -DUNDERSCORE_SYMBOLS -c mmx_cmod.S - .c.obj: $(CC) $(CFLAGS) -I..\..\plugins $(GLIB) $(GTK) $(SPELL) $< @@ -31,7 +28,6 @@ xchat-icon.obj: xchat.res clean: @del *.obj - @del mmx_cmod.o @del $(PROG) @del xchat.rc @del xchat.res diff --git a/src/makefile.mak b/src/makefile.mak index 88ac57d7..2826de8c 100644 --- a/src/makefile.mak +++ b/src/makefile.mak @@ -10,7 +10,6 @@ clean: @del common\*.obj @del common\xchatcommon.lib @del fe-gtk\*.obj - @del fe-gtk\mmx_cmod.o @del fe-gtk\xchat.exe @del fe-gtk\xchat.rc @del fe-gtk\xchat.res diff --git a/src/makeinc.skel b/src/makeinc.skel index ebaa9c22..becb9341 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -43,8 +43,6 @@ LDFLAGS = $(LDFLAGS) msvcrt_winxp.obj LUAPATH = c:\mozilla-build\build\lua-wdk-5.1.4-2-x86 PYTHONPATH = c:\mozilla-build\python-2.6-x86 TCLPATH = c:\mozilla-build\tcl-8.5-x86 - -MMX = YES !endif ############################################################# @@ -113,8 +111,3 @@ textgui.obj \ urlgrab.obj \ userlistgui.obj \ xtext.obj - -!ifdef MMX -FEGTK_OBJECTS = $(FEGTK_OBJECTS) mmx_cmod.o -CFLAGS = $(CFLAGS) -DUSE_MMX -!endif