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:
@@ -14,14 +14,14 @@ include ../../build/msw/config.gcc
|
||||
|
||||
LIBDIRNAME = \
|
||||
.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
MFC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
MFCTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) -I.\..\..\src\tiff \
|
||||
-I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
|
||||
-I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
|
||||
MFC_OBJECTS = \
|
||||
$(OBJS)\mfc_mfc.o \
|
||||
$(OBJS)\mfc_mfc_rc.o
|
||||
MFCTEST_OBJECTS = \
|
||||
$(OBJS)\mfctest_mfctest.o \
|
||||
$(OBJS)\mfctest_mfctest_rc.o
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
|
||||
@@ -139,19 +139,19 @@ $(OBJS):
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(OBJS)\mfc.exe
|
||||
all: $(OBJS)\mfctest.exe
|
||||
|
||||
$(OBJS)\mfc_mfc.o: .\mfc.cpp
|
||||
$(CXX) -c -o $@ $(MFC_CXXFLAGS) $<
|
||||
$(OBJS)\mfctest_mfctest.o: .\mfctest.cpp
|
||||
$(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\mfc_mfc_rc.o: .\mfc.rc
|
||||
$(OBJS)\mfctest_mfctest_rc.o: .\mfctest.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)
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
-if exist $(OBJS)\mfc.exe del $(OBJS)\mfc.exe
|
||||
-if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe
|
||||
|
||||
$(OBJS)\mfc.exe: $(MFC_OBJECTS) $(OBJS)\mfc_mfc_rc.o
|
||||
$(CXX) -o $@ $(MFC_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
|
||||
$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest_rc.o
|
||||
$(CXX) -o $@ $(MFCTEST_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