Regen Bakefiles for OSX HID integration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -21,6 +21,7 @@ BCCDIR = $(MAKEDIR)\.. | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| WX_RELEASE_NODOT = 25 | ||||
| OBJS = \ | ||||
| 	bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| SETUPHDIR = \ | ||||
| @@ -28,7 +29,7 @@ SETUPHDIR = \ | ||||
| TAB_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ | ||||
| 	$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ | ||||
| 	$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \ | ||||
| 	-I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS) | ||||
| 	-I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS) | ||||
| TAB_OBJECTS =  \ | ||||
| 	$(OBJS)\tab_tab.obj | ||||
|  | ||||
| @@ -105,23 +106,24 @@ __DLLFLAG_p_1 = -dWXUSINGDLL | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "0" | ||||
| __WXLIB_CORE_p = \ | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "0" | ||||
| __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| __WXLIB_BASE_p = \ | ||||
| 	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||
| !endif | ||||
| !if "$(MONOLITHIC)" == "1" | ||||
| __WXLIB_MONO_p = \ | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib | ||||
| 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib | ||||
| !endif | ||||
| !if "$(USE_GUI)" == "1" | ||||
| __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib | ||||
| __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib | ||||
| !endif | ||||
| !if "$(USE_GUI)" == "1" | ||||
| __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib | ||||
| __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib | ||||
| !endif | ||||
| !if "$(USE_GUI)" == "1" | ||||
| __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib | ||||
| __LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib | ||||
| !endif | ||||
| !if "$(MSLU)" == "1" | ||||
| __UNICOWS_LIB_p = unicows.lib | ||||
| @@ -166,11 +168,11 @@ clean: | ||||
|  | ||||
| $(OBJS)\tab.exe: $(TAB_OBJECTS)  $(OBJS)\tab_tab.res | ||||
| 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&| | ||||
| 	c0w32.obj $(TAB_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\tab_tab.res | ||||
| 	c0w32.obj $(TAB_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\tab_tab.res | ||||
| | | ||||
|  | ||||
| $(OBJS)\tab_tab.obj: .\tab.cpp | ||||
| 	$(CXX) -q -c -P -o$@ $(TAB_CXXFLAGS) $** | ||||
|  | ||||
| $(OBJS)\tab_tab.res: .\tab.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$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $** | ||||
| 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $** | ||||
|   | ||||
		Reference in New Issue
	
	Block a user