diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-17 21:29:53 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2014-05-17 21:29:53 +0200 |
| commit | bcb9f8b3ae7d477a35e2baa48c5f5bcff2d98986 (patch) | |
| tree | 309b57b1ad4abb89e133b08ddebabbbdd06a03c3 /plugingui/Makefile.mingw32 | |
| parent | 0e048dee411cc20beb2a8667e5bb339f9b7fb939 (diff) | |
| parent | 488070f321b1fb24bb0a7022c321c574fd4b06ac (diff) | |
Merge branch 'master' into resample
Pull in changes from master.
Diffstat (limited to 'plugingui/Makefile.mingw32')
| -rw-r--r-- | plugingui/Makefile.mingw32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32 index d1cd3bc..3a9542a 100644 --- a/plugingui/Makefile.mingw32 +++ b/plugingui/Makefile.mingw32 @@ -3,7 +3,7 @@ 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 -lpng -lz -pthread +LDFLAGS=-mconsole -lgdi32 -lsetupapi -lws2_32 -L/local/lib -lz -pthread C_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ @@ -39,6 +39,7 @@ CXX_SOURCES = \ $(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 \ |