--- glide64_0_7_ME/Makefile.old	2005-01-07 13:22:18.878299788 -0800
+++ glide64_0_7_ME/Makefile	2005-01-07 13:23:09.289287824 -0800
@@ -1,11 +1,11 @@
 CC = gcc
 #CFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -Iwrapper/ -g -mmmx -msse
 #CFLAGS = -DUSE_GTK `sdl-config --cflags` `gtk-config --cflags` -Iwrapper/ -O3 -mcpu=athlon -ffast-math -funroll-loops -fomit-frame-pointer -msse -mmmx
-CFLAGS = -DUSE_GTK -DGL_GLEXT_PROTOTYPES `sdl-config --cflags` `gtk-config --cflags` -Iwrapper/
+CFLAGS = -DGL_GLEXT_PROTOTYPES `sdl-config --cflags` `pkg-config --cflags gtk+-2.0 glib-2.0` -D_GTK2 -Iwrapper/
 CXX = g++
 CPPFLAGS = $(CFLAGS)
 LD = g++
-LDFLAGS = -lGL -lGLU -L/usr/X11R6/lib -lSDL
+LDFLAGS = -lGL -lGLU `sdl-config --libs` `pkg-config --libs gtk+-2.0 glib-2.0`
 
 OBJECTS = Main.o \
 	rdp.o \
@@ -30,8 +30,7 @@
 all: Glide64.so instruction
 
 Glide64.so: font.h cursor.h $(OBJECTS)
-	$(LD) -shared -Wl,-Bsymbolic `gtk-config --libs` $(LDFLAGS) -o $@ $(OBJECTS)
-	strip --strip-all $@
+	$(LD) -shared -Wl,-Bsymbolic $(LDFLAGS) -o $@ $(OBJECTS)
 
 font.h:	compiletex
 	./compiletex font.tex font.h font
--- glide64_0_7_ME/Config.cpp.old	2005-01-07 13:30:42.498170544 -0800
+++ glide64_0_7_ME/Config.cpp	2005-01-07 13:31:07.818666816 -0800
@@ -594,7 +594,7 @@
 static void okButtonCallback(GtkWidget *widget, void *data)
 {
    ConfigDialog *configDialog = (ConfigDialog*)data;
-   char *s;
+   const gchar *s;
    int i,n=0;
    
    s = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(configDialog->windowResCombo)->entry));