Turn off debug

[mesa.git] / src / mesa / Makefile.mgw

diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index fd1e45fd66a16ee81c812bbebf2752072058eb03..30b32660cbaaa5cc5e40e4287184112af7569532 100644 (file)
--- a/src/mesa/Makefile.mgw
+++ b/src/mesa/Makefile.mgw
@@ -20,9 +20,9 @@
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# MinGW core makefile v1.3 for Mesa
+# MinGW core makefile v1.4 for Mesa
 #
-#  Copyright (C) 2002 - Borca Daniel
+#  Copyright (C) 2002 - Daniel Borca
 #  Email : dborca@users.sourceforge.net
 #  Web   : http://www.geocities.com/dborca
 
@@ -71,13 +71,14 @@ endif
 LDLIBS = -lgdi32
 
 CC = mingw32-gcc
-CFLAGS += -DBUILD_GL32 -D_OPENGL32_ -D_MSC_VER
+CFLAGS += -DBUILD_GL32 -D_OPENGL32_
 CFLAGS += $(INCLUDE_DIRS)
+CFLAGS += -DUSE_EXTERNAL_DXTN_LIB=1
 ifeq ($(FX),1)
   CFLAGS += -I$(GLIDE)/include -DFX
   LDLIBS += -L$(GLIDE)/lib -lglide3x
-  GL_DEF = drivers/glide/fxopengl.def
-  GL_RES = drivers/glide/fx.rc
+  GL_DEF = drivers/windows/fx/fxopengl.def
+  GL_RES = drivers/windows/fx/fx.rc
 else
   ifeq ($(ICD),1)
     CFLAGS += -DUSE_MGL_NAMESPACE
@@ -88,7 +89,7 @@ else
 endif
 
 AR = ar
-ARFLAGS = rus
+ARFLAGS = crus
 
 ifeq ($(wildcard $(addsuffix /rm.exe,$(subst ;, ,$(PATH)))),)
 UNLINK = del $(subst /,\,$(1))
@@ -111,7 +112,7 @@ endif
 ifeq ($(FX),1)
 DRIVER_SOURCES = \
        $(GLIDE_DRIVER_SOURCES) \
-       drivers/glide/fxwgl.c
+       drivers/windows/fx/fxwgl.c
 else
 ifeq ($(ICD),1)
 DRIVER_SOURCES = \
@@ -157,10 +158,18 @@ x86/gen_matypes.exe: x86/gen_matypes.c
 # [dBorca]
 # glapi_x86.S needs some adjustments
 # in order to generate correct entrypoints
+# Trick: change the following condition to
+# be always false if you need C entrypoints
+# with USE_X86_ASM (useful for trace/debug)
+ifeq (1,1)
 x86/glapi_x86.o: x86/glapi_x86.S
        $(CC) -o $@ $(CFLAGS) -U__WIN32__ -DSTDCALL_API -c $<
-#main/dispatch.o: main/dispatch.c
-#      $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
+else
+main/dispatch.o: main/dispatch.c
+       $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
+glapi/glapi.o: glapi/glapi.c
+       $(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
+endif
 
 # [dBorca]
 # if we want codegen, we have to stdcall
@@ -174,12 +183,14 @@ clean:
        -$(call UNLINK,math/*.o)
        -$(call UNLINK,shader/*.o)
        -$(call UNLINK,sparc/*.o)
+       -$(call UNLINK,ppc/*.o)
        -$(call UNLINK,swrast/*.o)
        -$(call UNLINK,swrast_setup/*.o)
        -$(call UNLINK,tnl/*.o)
        -$(call UNLINK,x86/*.o)
        -$(call UNLINK,drivers/common/*.o)
+       -$(call UNLINK,drivers/glide/*.o)
+       -$(call UNLINK,drivers/windows/fx/*.o)
+       -$(call UNLINK,drivers/windows/fx/*.res)
        -$(call UNLINK,drivers/windows/gdi/*.o)
        -$(call UNLINK,drivers/windows/icd/*.o)
-       -$(call UNLINK,drivers/glide/*.o)
-       -$(call UNLINK,drivers/glide/*.res)