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.wat
|
||||
!include ../../build/msw/config.wat
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
@@ -132,6 +132,11 @@ __UNICODE_DEFINE_p =
|
||||
!ifeq UNICODE 1
|
||||
__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
|
||||
!endif
|
||||
__WXLIB_ADV_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_ADV_p = &
|
||||
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
|
||||
!endif
|
||||
__WXLIB_BASE_p =
|
||||
!ifeq MONOLITHIC 0
|
||||
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
|
||||
@@ -166,6 +171,7 @@ LIBDIRNAME = &
|
||||
OBJS = &
|
||||
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
|
||||
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)
|
||||
@@ -189,7 +195,7 @@ clean : .SYMBOLIC
|
||||
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
|
||||
-if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
|
||||
|
||||
data :
|
||||
data : .SYMBOLIC
|
||||
if not exist $(OBJS) mkdir $(OBJS)
|
||||
for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
@@ -200,6 +206,6 @@ $(OBJS)\dialogs.exe : $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs.res
|
||||
@%append $(OBJS)\dialogs.lbc option incremental
|
||||
@%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(DIALOGS_OBJECTS)) do @%append $(OBJS)\dialogs.lbc file %i
|
||||
@for %i in ( $(__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)\dialogs.lbc library %i
|
||||
@for %i in ( $(__WXLIB_ADV_p) $(__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)\dialogs.lbc library %i
|
||||
@%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
|
||||
wlink @$(OBJS)\dialogs.lbc
|
||||
|
Reference in New Issue
Block a user