diff Makefile @ 9:b455f2d8aac9

Implement Preview.
author pyon@macmini
date Thu, 24 Apr 2014 18:31:39 +0900
parents fdba695b99f1
children dfcf8c973219
line wrap: on
line diff
--- a/Makefile	Fri Nov 01 18:44:37 2013 +0900
+++ b/Makefile	Thu Apr 24 18:31:39 2014 +0900
@@ -1,5 +1,5 @@
 # Makefile for wxWidgets Application
-# Last Change: 11-Sep-2013.
+# Last Change: 05-Feb-2014.
 # by Takayuki Mutoh
 #
 
@@ -13,8 +13,8 @@
 
 # For Microsoft Windows
 ifdef COMSPEC
-WXCXXFLAGS = -I/local/lib/wx/include/msw-unicode-static-2.9 -I/local/include/wx-2.9 -D_LARGEFILE_SOURCE=unknown -D__WXMSW__ -mthreads
-WXLIBS = -L/local/lib -Wl,--subsystem,windows -mwindows /local/lib/libwx_mswu_richtext-2.9.a /local/lib/libwx_mswu_xrc-2.9.a /local/lib/libwx_mswu_webview-2.9.a /local/lib/libwx_mswu_qa-2.9.a /local/lib/libwx_baseu_net-2.9.a /local/lib/libwx_mswu_html-2.9.a /local/lib/libwx_mswu_adv-2.9.a /local/lib/libwx_mswu_core-2.9.a /local/lib/libwx_baseu_xml-2.9.a /local/lib/libwx_baseu-2.9.a -lwxregexu-2.9 -lwxexpat-2.9 -lwxtiff-2.9 -lwxjpeg-2.9 -lwxpng-2.9 -lwxzlib-2.9 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
+WXCXXFLAGS = -I/local/lib/wx/include/msw-unicode-static-3.0 -I/local/include/wx-3.0 -D_LARGEFILE_SOURCE=unknown -D__WXMSW__ -mthreads
+WXLIBS = -L/local/lib -Wl,--subsystem,windows -mwindows /local/lib/libwx_mswu_richtext-3.0.a /local/lib/libwx_mswu_xrc-3.0.a /local/lib/libwx_mswu_webview-3.0.a /local/lib/libwx_mswu_qa-3.0.a /local/lib/libwx_baseu_net-3.0.a /local/lib/libwx_mswu_html-3.0.a /local/lib/libwx_mswu_adv-3.0.a /local/lib/libwx_mswu_core-3.0.a /local/lib/libwx_baseu_xml-3.0.a /local/lib/libwx_baseu-3.0.a -lwxregexu-3.0 -lwxexpat-3.0 -lwxtiff-3.0 -lwxjpeg-3.0 -lwxpng-3.0 -lwxzlib-3.0 -lrpcrt4 -loleaut32 -lole32 -luuid -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32
 EXECUTABLE = $(PROGNAME).exe
 
 # For Apple OSX
@@ -37,6 +37,7 @@
 	  $(OBJDIR)/hist.o \
 	  $(OBJDIR)/index.o \
 	  $(OBJDIR)/param.o \
+	  $(OBJDIR)/preview.o \
 	  $(OBJDIR)/bprint.o \
 	  $(OBJDIR)/db.o \
 	  $(OBJDIR)/marksheet.o \
@@ -83,6 +84,12 @@
 $(OBJDIR)/param.o: param.cpp param.h common.h
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
+$(OBJDIR)/thumbnail.o: thumbnail.cpp thumbnail.h common.h
+	$(CXX) -c $< -o $@ $(CXXFLAGS)
+
+$(OBJDIR)/preview.o: preview.cpp preview.h common.h
+	$(CXX) -c $< -o $@ $(CXXFLAGS)
+
 $(OBJDIR)/bprint.o: bprint.cpp bprint.h marksheet.h common.h dndfile.h
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
@@ -99,7 +106,7 @@
 # for icon
 ifdef COMSPEC
 $(OBJDIR)/sample_rc.o: sample.rc
-	windres -i sample.rc -o $@ -I/local/include/wx-2.9
+	windres -i sample.rc -o $@ -I/local/include/wx-3.0
 endif
 
 $(EXECUTABLE): $(PROGNAME)