diff Makefile @ 15:c262e17de9b1

db download skip-mode.
author pyon@macmini
date Sat, 08 Jun 2019 15:50:59 +0900
parents 799b6008db8e
children b651aa41b9d4
line wrap: on
line diff
--- a/Makefile	Sun Dec 09 14:38:15 2018 +0900
+++ b/Makefile	Sat Jun 08 15:50:59 2019 +0900
@@ -1,5 +1,5 @@
 # Makefile for wxWidgets Application
-# Last Change: 2018-11-09  08:45:49.
+# Last Change: 2019-05-29  15:43:02.
 # by Takayuki Mutoh
 #
 
@@ -8,13 +8,16 @@
 ### Variables ###
 OBJDIR = ./obj
 CXX = g++
+ARCH = 32
+#ARCH = 64
+LOCAL = C:/msys64/home/muto/local$(ARCH)
 vpath %.cpp ./src
 vpath %.h   ./include
 
 # For Microsoft Windows
 ifdef COMSPEC
-WXCXXFLAGS = -I/local/lib/wx/include/msw-unicode-static-3.1 -I/local/include/wx-3.1 -D_LARGEFILE_SOURCE=unknown -D__WXMSW__ -mthreads
-WXLIBS =-L/local/lib -Wl,--subsystem,windows -mwindows /local/lib/libwx_mswu_xrc-3.1.a /local/lib/libwx_mswu_qa-3.1.a /local/lib/libwx_baseu_net-3.1.a /local/lib/libwx_mswu_html-3.1.a /local/lib/libwx_mswu_adv-3.1.a /local/lib/libwx_mswu_core-3.1.a /local/lib/libwx_baseu_xml-3.1.a /local/lib/libwx_baseu-3.1.a -lwxtiff-3.1 -lwxjpeg-3.1 -lwxpng-3.1 -lwxregexu-3.1 -lwxscintilla-3.1 -lwxexpat-3.1 -lwxzlib-3.1 -lrpcrt4 -loleaut32 -lole32 -luuid -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32 -loleacc 
+WXCXXFLAGS = -I$(LOCAL)/lib/wx/include/msw-unicode-static-3.1 -I$(LOCAL)/include/wx-3.1 -D_LARGEFILE_SOURCE=unknown -D__WXMSW__ -mthreads
+WXLIBS = -L$(LOCAL)/lib -Wl,--subsystem,windows -mwindows -lwx_mswu_xrc-3.1 -lwx_mswu_qa-3.1 -lwx_baseu_net-3.1 -lwx_mswu_html-3.1 -lwx_mswu_adv-3.1 -lwx_mswu_core-3.1 -lwx_baseu_xml-3.1 -lwx_baseu-3.1 -lwxtiff-3.1 -lwxjpeg-3.1 -lwxpng-3.1 -lwxregexu-3.1 -lwxscintilla-3.1 -lwxexpat-3.1 -lwxzlib-3.1 -lrpcrt4 -loleaut32 -lole32 -luuid -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32 -loleacc 
 LIBS = $(WXLIBS) -static
 
 EXECUTABLE = $(PROGNAME).exe
@@ -33,9 +36,10 @@
 
 
 OBJ = $(OBJDIR)/main.o \
+	  $(OBJDIR)/rsearcher.o \
 	  $(OBJDIR)/auth.o \
 	  $(OBJDIR)/mngdb.o \
-	  $(OBJDIR)/rsearcher.o \
+	  $(OBJDIR)/index.o \
 	  $(OBJDIR)/net.o
 
 ifdef COMSPEC
@@ -62,6 +66,9 @@
 $(OBJDIR)/auth.o: auth.cpp auth.h id.h
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
+$(OBJDIR)/index.o: index.cpp index.h id.h
+	$(CXX) -c $< -o $@ $(CXXFLAGS)
+
 $(OBJDIR)/net.o: net.cpp net.h 
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
@@ -72,7 +79,7 @@
 # for icon
 ifdef COMSPEC
 $(OBJDIR)/sample_rc.o: sample.rc
-	windres -i sample.rc -o $@ -I/local/include/wx-3.1
+	windres -i sample.rc -o $@ -I$(LOCAL)/include/wx-3.1
 endif
 
 $(EXECUTABLE): $(PROGNAME)
@@ -97,9 +104,6 @@
 	open $(PROGNAME).app
 endif
 
-go:
-	go build -o rsearcher main.go
-
 tgz:
 	tar cvfz a.tgz src include Makefile memo.txt