diff options
| author | Julien Cristau <[email protected]> | 2007-07-23 16:28:56 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2007-07-23 16:28:56 +0200 |
| commit | c5837f279107d9eac4d9afdfc63ae3e8d2184ceb (patch) | |
| tree | bbe3e57db626536284f7f278ff93e8f0bb566403 /configs | |
| parent | 490bd43f18f8f17ab7b8d5789944b50b3e5f598f (diff) | |
| parent | 005eea249c2565cd33bb7c5f599040ead1ef99a5 (diff) | |
Merge branch 'mesa_7_0_branch' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/config.mgw | 42 | ||||
| -rw-r--r-- | configs/default | 4 |
2 files changed, 44 insertions, 2 deletions
diff --git a/configs/config.mgw b/configs/config.mgw new file mode 100644 index 00000000000..b961eb965cb --- /dev/null +++ b/configs/config.mgw @@ -0,0 +1,42 @@ +# MinGW config include file updated for Mesa 7.0
+#
+# Updated : by Heromyth, on 2007-7-21
+# Email : [email protected]
+# Bugs : 1) All the default settings work fine. But the setting X86=1 can't work.
+# The others havn't been tested yet.
+# 2) The generated DLLs are *not* compatible with the ones built
+# with the other compilers like VC8, especially for GLUT.
+# 3) Although more tests are needed, it can be used individually!
+
+# The generated DLLs by MingW with STDCALL are not totally compatible
+# with the ones linked by Microsoft's compilers.
+#
+# xxx_USING_STDCALL = 1 Compiling MESA with __stdcall. This is default!
+#
+# xxx_USING_STDCALL = 0 Compiling MESA without __stdcall. I like this:)
+#
+
+# In fact, GL_USING_STDCALL and GLUT_USING_STDCALL can be
+# different. For example:
+#
+# GL_USING_STDCALL = 0
+# GLUT_USING_STDCALL = 1
+#
+# Suggested setting:
+#
+# ALL_USING_STDCALL = 1
+#
+# That's default!
+#
+
+
+ALL_USING_STDCALL = 1
+
+
+ifeq ($(ALL_USING_STDCALL),1)
+ GL_USING_STDCALL = 1
+ GLUT_USING_STDCALL = 1
+else
+ GL_USING_STDCALL = 0
+ GLUT_USING_STDCALL = 0
+endif
diff --git a/configs/default b/configs/default index a7de3f813d6..81f0338b271 100644 --- a/configs/default +++ b/configs/default @@ -9,8 +9,8 @@ CONFIG_NAME = default # Version info MESA_MAJOR=7 -MESA_MINOR=1 -MESA_TINY=0 +MESA_MINOR=0 +MESA_TINY=1 # external projects. This should be useless now that we use libdrm. DRM_SOURCE_PATH=$(TOP)/../drm |