regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
!include <../../build/config.vc>
|
||||
!include <../../build/msw/config.vc>
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
@@ -23,7 +23,7 @@ VSCROLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
|
||||
/I.\..\..\src\jpeg /I.\..\..\src\png /I.\..\..\src\zlib /I.\..\..\src\regex \
|
||||
/I.\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS)
|
||||
VSCROLL_OBJECTS = \
|
||||
$(OBJS)\vscroll_vscroll.obj \
|
||||
$(OBJS)\vscroll_vstest.obj \
|
||||
$(OBJS)\vscroll_vscroll.res
|
||||
|
||||
### Conditionally set variables: ###
|
||||
@@ -160,10 +160,10 @@ __WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
|
||||
____DEBUGINFO_2_p = /D_DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
____DEBUGINFO_2_p = /DNDEBUG
|
||||
____DEBUGINFO_2_p =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
____DEBUGINFO_2_p = /DNDEBUG
|
||||
____DEBUGINFO_2_p =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
____DEBUGINFO_2_p = /D_DEBUG
|
||||
@@ -172,16 +172,16 @@ ____DEBUGINFO_2_p = /D_DEBUG
|
||||
____DEBUGINFO_2_p_1 = /d _DEBUG
|
||||
!endif
|
||||
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
||||
____DEBUGINFO_2_p_1 = /d NDEBUG
|
||||
____DEBUGINFO_2_p_1 =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "0"
|
||||
____DEBUGINFO_2_p_1 = /d NDEBUG
|
||||
____DEBUGINFO_2_p_1 =
|
||||
!endif
|
||||
!if "$(DEBUG_INFO)" == "1"
|
||||
____DEBUGINFO_2_p_1 = /d _DEBUG
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
____DEBUGRUNTIME_2_p = /DNDEBUG
|
||||
____DEBUGRUNTIME_2_p =
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
____DEBUGRUNTIME_2_p = /D_DEBUG
|
||||
@@ -190,7 +190,7 @@ ____DEBUGRUNTIME_2_p = /D_DEBUG
|
||||
____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p)
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "0"
|
||||
____DEBUGRUNTIME_2_p_1 = /d NDEBUG
|
||||
____DEBUGRUNTIME_2_p_1 =
|
||||
!endif
|
||||
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
|
||||
____DEBUGRUNTIME_2_p_1 = /d _DEBUG
|
||||
@@ -208,12 +208,12 @@ $(OBJS):
|
||||
|
||||
all: $(OBJS)\vscroll.exe
|
||||
|
||||
$(OBJS)\vscroll_vscroll.obj: .\vscroll.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(VSCROLL_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\vscroll_vscroll.res: .\vscroll.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 $**
|
||||
|
||||
$(OBJS)\vscroll_vstest.obj: .\vstest.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(VSCROLL_CXXFLAGS) $**
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
||||
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
||||
|
Reference in New Issue
Block a user