aboutsummaryrefslogtreecommitdiff
path: root/dxtn
diff options
context:
space:
mode:
Diffstat (limited to 'dxtn')
-rw-r--r--dxtn/Makefile20
-rw-r--r--dxtn/Makefile.old14
-rw-r--r--dxtn/dxtn.def6
-rw-r--r--dxtn/txc_compress_dxtn.c2
4 files changed, 14 insertions, 28 deletions
diff --git a/dxtn/Makefile b/dxtn/Makefile
index 975063f8b..b014f81cd 100644
--- a/dxtn/Makefile
+++ b/dxtn/Makefile
@@ -1,18 +1,10 @@
-CFLAGS += -Wall -pedantic -fPIC
-OPT_CFLAGS = -O3
-LDFLAGS += -shared -fPIC
-OBJS = txc_compress_dxtn.o txc_fetch_dxtn.o
-LIB = libtxc_dxtn.so
+SHAREDLIB = dxtn
-$(LIB): $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS)
+CSRCS = \
+ txc_compress_dxtn.c \
+ txc_fetch_dxtn.cc
-%.o: %.c txc_dxtn.h
- $(CC) $(CFLAGS) $(OPT_CFLAGS) -c -o $@ $<
+INCLUDES += $(MHMAKECONF)\mesalib\include
-clean:
- rm -f $(OBJS) $(LIB)
+CCFLAGS += -TP
-install: $(LIB)
- install -d $(DESTDIR)/usr/lib
- install -m 755 $(LIB) $(DESTDIR)/usr/lib
diff --git a/dxtn/Makefile.old b/dxtn/Makefile.old
deleted file mode 100644
index 21b502ee7..000000000
--- a/dxtn/Makefile.old
+++ /dev/null
@@ -1,14 +0,0 @@
-libtxc_dxtn.so: txc_compress_dxtn.o txc_fetch_dxtn.o
- gcc -O3 -Wall -pedantic -fPIC -lpthread -shared -o libtxc_dxtn.so txc_compress_dxtn.o txc_fetch_dxtn.o
-
-txc_compress_dxtn.o : txc_compress_dxtn.c txc_dxtn.h
- gcc -c -O3 -Wall -pedantic -fPIC -o txc_compress_dxtn.o txc_compress_dxtn.c
-
-txc_fetch_dxtn.o : txc_fetch_dxtn.c txc_dxtn.h
- gcc -c -O3 -Wall -pedantic -fPIC -o txc_fetch_dxtn.o txc_fetch_dxtn.c
-
-clean:
- rm txc_fetch_dxtn.o txc_compress_dxtn.o libtxc_dxtn.so
-
-install: libtxc_dxtn.so
- install libtxc_dxtn.so /usr/lib/
diff --git a/dxtn/dxtn.def b/dxtn/dxtn.def
new file mode 100644
index 000000000..a9e8b80b0
--- /dev/null
+++ b/dxtn/dxtn.def
@@ -0,0 +1,6 @@
+EXPORTS
+ fetch_2d_texel_rgb_dxt1
+ fetch_2d_texel_rgba_dxt1
+ fetch_2d_texel_rgba_dxt3
+ fetch_2d_texel_rgba_dxt5
+ tx_compress_dxtn \ No newline at end of file
diff --git a/dxtn/txc_compress_dxtn.c b/dxtn/txc_compress_dxtn.c
index 0be8d4618..d279401d7 100644
--- a/dxtn/txc_compress_dxtn.c
+++ b/dxtn/txc_compress_dxtn.c
@@ -26,6 +26,8 @@
#include <stdlib.h>
#include "txc_dxtn.h"
+#include "GL/gl.h"
+
/* weights used for error function, basically weights (unsquared 2/4/1) according to rgb->luminance conversion
not sure if this really reflects visual perception */
#define REDWEIGHT 4