more samples makefiles fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,8 +22,12 @@ RICHEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
-I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
|
||||
-I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
|
||||
RICHEDIT_OBJECTS = \
|
||||
$(OBJS)\richedit_richedit.o \
|
||||
$(OBJS)\richedit_richedit_rc.o
|
||||
$(OBJS)\richedit_sample_rc.o \
|
||||
$(OBJS)\richedit_wxLayout.o \
|
||||
$(OBJS)\richedit_kbList.o \
|
||||
$(OBJS)\richedit_wxllist.o \
|
||||
$(OBJS)\richedit_wxlparser.o \
|
||||
$(OBJS)\richedit_wxlwindow.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -141,17 +145,29 @@ $(OBJS):
|
||||
|
||||
all: $(OBJS)\richedit.exe
|
||||
|
||||
$(OBJS)\richedit_richedit.o: .\richedit.cpp
|
||||
$(OBJS)\richedit_kbList.o: .\kbList.cpp
|
||||
$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\richedit_richedit_rc.o: .\richedit.rc
|
||||
$(OBJS)\richedit_sample_rc.o: .\..\..\samples\sample.rc
|
||||
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
|
||||
|
||||
$(OBJS)\richedit_wxLayout.o: .\wxLayout.cpp
|
||||
$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\richedit_wxllist.o: .\wxllist.cpp
|
||||
$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\richedit_wxlparser.o: .\wxlparser.cpp
|
||||
$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\richedit_wxlwindow.o: .\wxlwindow.cpp
|
||||
$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
-if exist $(OBJS)\richedit.exe del $(OBJS)\richedit.exe
|
||||
|
||||
$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_richedit_rc.o
|
||||
$(OBJS)\richedit.exe: $(RICHEDIT_OBJECTS) $(OBJS)\richedit_sample_rc.o
|
||||
$(CXX) -o $@ $(RICHEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
|
||||
|
||||
.PHONY: all clean
|
||||
|
Reference in New Issue
Block a user