1 files changed, 60 insertions, 65 deletions
diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32
index b16535b..3f52e8a 100644
--- a/plugingui/Makefile.mingw32
+++ b/plugingui/Makefile.mingw32
@@ -1,67 +1,62 @@
-top_srcdir=..
-include Makefile.am.plugingui
-
-CFLAGS=-DSTANDALONE -DWIN32 -DUSE_THREAD ${PLUGIN_GUI_CFLAGS} \
-										-I$(top_srcdir)/src -I/local/include 
-LDFLAGS=-mconsole -lgdi32 -lsetupapi -lws2_32 -L/local/lib -lz -pthread
-
-C_SOURCES = \
-	$(top_srcdir)/hugin/hugin.c \
-	$(top_srcdir)/hugin/hugin_syslog.c
-
-CXX_SOURCES = \
-	$(top_srcdir)/plugingui/nativewindow_x11.cc \
-	$(top_srcdir)/plugingui/nativewindow_win32.cc \
-	$(top_srcdir)/plugingui/plugingui.cc \
-	$(top_srcdir)/plugingui/pluginconfig.cc \
-	$(top_srcdir)/plugingui/label.cc \
-	$(top_srcdir)/plugingui/eventhandler.cc \
-	$(top_srcdir)/plugingui/font.cc \
-	$(top_srcdir)/plugingui/window.cc \
-	$(top_srcdir)/plugingui/widget.cc \
-	$(top_srcdir)/plugingui/colour.cc \
-	$(top_srcdir)/plugingui/painter.cc \
-	$(top_srcdir)/plugingui/button.cc \
-	$(top_srcdir)/plugingui/pixelbuffer.cc \
-	$(top_srcdir)/plugingui/lineedit.cc \
-	$(top_srcdir)/plugingui/led.cc \
-	$(top_srcdir)/plugingui/checkbox.cc \
-	$(top_srcdir)/plugingui/slider.cc \
-	$(top_srcdir)/plugingui/listbox.cc \
-	$(top_srcdir)/plugingui/verticalline.cc \
-	$(top_srcdir)/plugingui/listboxthin.cc \
-	$(top_srcdir)/plugingui/listboxbasic.cc \
-	$(top_srcdir)/plugingui/filebrowser.cc \
-	$(top_srcdir)/plugingui/directory.cc \
-	$(top_srcdir)/plugingui/knob.cc \
-	$(top_srcdir)/plugingui/combobox.cc \
-	$(top_srcdir)/plugingui/image.cc \
-	$(top_srcdir)/plugingui/scrollbar.cc \
-	$(top_srcdir)/plugingui/progressbar.cc \
-	$(top_srcdir)/plugingui/resource.cc \
-	$(top_srcdir)/plugingui/resource_data.cc \
-	$(top_srcdir)/plugingui/lodepng/lodepng.cpp \
-	$(top_srcdir)/src/thread.cc \
-	$(top_srcdir)/src/semaphore.cc \
-	$(top_srcdir)/src/mutex.cc \
-	$(top_srcdir)/src/messagehandler.cc \
-	$(top_srcdir)/src/messagereceiver.cc
-
-OBJECTS=$(CXX_SOURCES:.cc=.o) $(C_SOURCES:.c=.o)
-#OBJECTS=$(PLUGIN_GUI_SOURCES:.cc=.o)
-
-#$(PLUGIN_GUI_SOURCES:.c=.o)
-
-all: $(CXX_SOURCES) $(C_SOURCES) plugingui.exe
-
-plugingui.exe: $(OBJECTS)
-	g++ -static -static-libgcc $(OBJECTS) $(LDFLAGS) $(CFLAGS) -o $@
-
-%.o: %.cc
-	g++ -g -static -static-libgcc -O2 -c $(CFLAGS) $< -o $@
-
-%.o: %.c
-	gcc -g -static -static-libgcc -O2 -c $(CFLAGS) $< -o $@
+DG_SRC = \
+	../src/configfile.cc \
+	../src/thread.cc \
+	../src/semaphore.cc \
+	../src/mutex.cc \
+	../src/messagehandler.cc \
+	../src/messagereceiver.cc
+
+DG_CFLAGS = -I.. -I../include -I../src -DSSE -msse -msse2 -DDISABLE_HUGIN
+
+GUI_SRC = \
+	testmain.cc \
+	dgwindow.cc \
+	nativewindow_win32.cc \
+	plugingui.cc \
+	pluginconfig.cc \
+	label.cc \
+	eventhandler.cc \
+	font.cc \
+	window.cc \
+	widget.cc \
+	colour.cc \
+	painter.cc \
+	button.cc \
+	pixelbuffer.cc \
+	lineedit.cc \
+	led.cc \
+	layout.cc \
+	checkbox.cc \
+	slider.cc \
+	scrollbar.cc \
+	textedit.cc \
+	listbox.cc \
+	listboxthin.cc \
+	listboxbasic.cc \
+	knob.cc \
+	filebrowser.cc \
+	directory.cc \
+	image.cc \
+	combobox.cc \
+	progressbar.cc \
+	verticalline.cc \
+	resource.cc \
+	resource_data.cc \
+	lodepng/lodepng.cpp
+
+GUI_CFLAGS=-DUSE_THREAD -DWIN32 -DSTANDALONE
+GUI_LIBS=-lgdi32 -lsetupapi -lws2_32
+
+DBG_SRC = \
+	../hugin/hugin.c \
+	../hugin/hugin_syslog.c
+
+DBG_CFLAGS=-I../hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX -DDISABLE_HUGIN
+
+all:
+	gcc $(DBG_CFLAGS) ../hugin/hugin.c -c
+	gcc $(DBG_CFLAGS) ../hugin/hugin_syslog.c -c
+	g++ -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) hugin.o hugin_syslog.o $(DG_SRC) ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) -o plugingui.exe
 
 clean:
-	rm -rf $(OBJECTS) plugingui.exe
+	del -f drumgizmo_vst.dll libdrumgizmo_vst.a