1) some compilers (Watcom) don't like it if wxBase library PCH file contains
symbols from GUI components and won't link a DLL 2) fixed subdirs recursion code - all options must be output 3) fixed subdirs recursion code - all options must be output 4) fix for watcom resource compiler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -36,7 +36,8 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
SVGTEST_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
|
||||
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../include $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I../../../samples -I$(srcdir)/../../include \
|
||||
$(CXXFLAGS)
|
||||
SVGTEST_OBJECTS = \
|
||||
$(__svgtest___win32rc) \
|
||||
svgtest_svgtest.o
|
||||
@@ -104,8 +105,9 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
|
||||
$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
|
||||
$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../include -o svgtest$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../../samples/sample.r
|
||||
$(__DLLFLAG_p_1) -i ../../../samples -i $(srcdir)/../../include -o \
|
||||
svgtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
|
||||
../../../samples/sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
|
||||
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
|
||||
@@ -146,7 +148,7 @@ svgtest$(EXEEXT): $(SVGTEST_OBJECTS) $(__svgtest___win32rc)
|
||||
$(__svgtest___mac_setfilecmd)
|
||||
|
||||
svgtest_sample_rc.o: $(srcdir)/../../../samples/sample.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2)
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../../samples
|
||||
|
||||
svgtest_svgtest.o: $(srcdir)/svgtest.cpp
|
||||
$(CXXC) -c -o $@ $(SVGTEST_CXXFLAGS) $<
|
||||
|
@@ -29,7 +29,8 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
|
||||
$(__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) -I.\..\..\include $(CXXFLAGS)
|
||||
-I.\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I..\..\..\samples \
|
||||
-I.\..\..\include $(CXXFLAGS)
|
||||
SVGTEST_OBJECTS = \
|
||||
$(OBJS)\svgtest_svgtest.obj
|
||||
|
||||
@@ -119,6 +120,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
|
||||
!if "$(UNICODE)" == "1"
|
||||
__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
|
||||
!endif
|
||||
!if "$(MSLU)" == "1"
|
||||
__UNICOWS_LIB_p = unicows.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
@@ -137,8 +141,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
|
||||
!endif
|
||||
|
||||
MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
|
||||
|
||||
|
||||
all: $(OBJS)
|
||||
$(OBJS):
|
||||
@@ -149,7 +151,7 @@ $(OBJS):
|
||||
all: $(OBJS)\svgtest.exe
|
||||
|
||||
$(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -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_1) $**
|
||||
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -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_1) -i..\..\..\samples $**
|
||||
|
||||
$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
|
||||
$(CXX) -q -c -P -o$@ $(SVGTEST_CXXFLAGS) $**
|
||||
@@ -161,5 +163,5 @@ clean:
|
||||
|
||||
$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res
|
||||
c0w32.obj $(SVGTEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\svgtest_sample.res
|
||||
|
|
||||
|
@@ -21,7 +21,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
$(__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) -I.\..\..\include $(CXXFLAGS)
|
||||
$(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)
|
||||
SVGTEST_OBJECTS = \
|
||||
$(OBJS)\svgtest_sample_rc.o \
|
||||
$(OBJS)\svgtest_svgtest.o
|
||||
@@ -113,6 +113,9 @@ endif
|
||||
ifeq ($(UNICODE),1)
|
||||
__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
|
||||
endif
|
||||
ifeq ($(MSLU),1)
|
||||
__UNICOWS_LIB_p = -lunicows
|
||||
endif
|
||||
ifeq ($(MONOLITHIC),0)
|
||||
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
endif
|
||||
@@ -131,8 +134,6 @@ ifeq ($(WXUNIV),1)
|
||||
__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
|
||||
endif
|
||||
|
||||
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
|
||||
|
||||
|
||||
all: $(OBJS)
|
||||
$(OBJS):
|
||||
@@ -143,7 +144,7 @@ $(OBJS):
|
||||
all: $(OBJS)\svgtest.exe
|
||||
|
||||
$(OBJS)\svgtest_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)
|
||||
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) --include-dir ../../../samples
|
||||
|
||||
$(OBJS)\svgtest_svgtest.o: .\svgtest.cpp
|
||||
$(CXX) -c -o $@ $(SVGTEST_CXXFLAGS) $<
|
||||
@@ -153,6 +154,6 @@ clean:
|
||||
-if exist $(OBJS)\svgtest.exe del $(OBJS)\svgtest.exe
|
||||
|
||||
$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample_rc.o
|
||||
$(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__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
|
||||
$(CXX) -o $@ $(SVGTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
|
||||
|
||||
.PHONY: all clean
|
||||
|
@@ -22,7 +22,7 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
|
||||
$(__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) /D_WINDOWS /I.\..\..\include $(CXXFLAGS)
|
||||
$(__DLLFLAG_p) /D_WINDOWS /I..\..\..\samples /I.\..\..\include $(CXXFLAGS)
|
||||
SVGTEST_OBJECTS = \
|
||||
$(OBJS)\svgtest_sample.res \
|
||||
$(OBJS)\svgtest_svgtest.obj
|
||||
@@ -140,6 +140,9 @@ __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
|
||||
!if "$(UNICODE)" == "1"
|
||||
__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
|
||||
!endif
|
||||
!if "$(MSLU)" == "1"
|
||||
__UNICOWS_LIB_p = unicows.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
@@ -210,7 +213,7 @@ $(OBJS):
|
||||
all: $(OBJS)\svgtest.exe
|
||||
|
||||
$(OBJS)\svgtest_sample.res: .\..\..\..\samples\sample.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /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_1) /d _WINDOWS $**
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /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_1) /d _WINDOWS /i ..\..\..\samples $**
|
||||
|
||||
$(OBJS)\svgtest_svgtest.obj: .\svgtest.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(SVGTEST_CXXFLAGS) $**
|
||||
@@ -222,5 +225,5 @@ clean:
|
||||
|
||||
$(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
$(SVGTEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
|
||||
$(SVGTEST_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
|
||||
<<
|
||||
|
@@ -162,12 +162,10 @@ SVGTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
|
||||
$(__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) -i=.\..\..\include $(CXXFLAGS)
|
||||
-i=. $(__DLLFLAG_p) -i=..\..\..\samples -i=.\..\..\include $(CXXFLAGS)
|
||||
SVGTEST_OBJECTS = &
|
||||
$(OBJS)\svgtest_svgtest.obj
|
||||
|
||||
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
|
||||
|
||||
|
||||
all : $(OBJS)
|
||||
$(OBJS) :
|
||||
@@ -178,7 +176,7 @@ $(OBJS) :
|
||||
all : .SYMBOLIC $(OBJS)\svgtest.exe
|
||||
|
||||
$(OBJS)\svgtest_sample.res : .AUTODEPEND .\..\..\..\samples\sample.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -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) $<
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -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) -i=..\..\..\samples $<
|
||||
|
||||
$(OBJS)\svgtest_svgtest.obj : .AUTODEPEND .\svgtest.cpp
|
||||
$(CXX) -zq -fo=$^@ $(SVGTEST_CXXFLAGS) $<
|
||||
@@ -197,6 +195,6 @@ $(OBJS)\svgtest.exe : $(SVGTEST_OBJECTS) $(OBJS)\svgtest_sample.res
|
||||
@%append $(OBJS)\svgtest.lbc option incremental
|
||||
@%append $(OBJS)\svgtest.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(SVGTEST_OBJECTS)) do @%append $(OBJS)\svgtest.lbc file %i
|
||||
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\svgtest.lbc library %i
|
||||
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_svg.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\svgtest.lbc library %i
|
||||
@%append $(OBJS)\svgtest.lbc option resource=$(OBJS)\svgtest_sample.res
|
||||
wlink @$(OBJS)\svgtest.lbc
|
||||
|
Reference in New Issue
Block a user