Fix the except sample being compiled when USE_EXCEPTIONS=0
This commit is contained in:
Raul Tambre
parent
8d345a6201
commit
5d3ef67019
@ -44,6 +44,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
|
||||
!if "$(USE_HTML)" == "1"
|
||||
__aui___depname = aui
|
||||
!endif
|
||||
!if "$(USE_EXCEPTIONS)" == "1"
|
||||
__except___depname = except
|
||||
!endif
|
||||
!if "$(USE_HTML)" == "1"
|
||||
__help___depname = help
|
||||
!endif
|
||||
@ -63,7 +66,7 @@ __xrc___depname = xrc
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname)
|
||||
all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname)
|
||||
|
||||
clean:
|
||||
-if exist .\*.obj del .\*.obj
|
||||
@ -528,11 +531,13 @@ event:
|
||||
call event.bat
|
||||
@del event.bat
|
||||
|
||||
!if "$(USE_EXCEPTIONS)" == "1"
|
||||
except:
|
||||
@echo cd except >except.bat
|
||||
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat
|
||||
call except.bat
|
||||
@del except.bat
|
||||
!endif
|
||||
|
||||
exec:
|
||||
@echo cd exec >exec.bat
|
||||
|
||||
@ -37,6 +37,9 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
|
||||
ifeq ($(USE_HTML),1)
|
||||
__aui___depname = aui
|
||||
endif
|
||||
ifeq ($(USE_EXCEPTIONS),1)
|
||||
__except___depname = except
|
||||
endif
|
||||
ifeq ($(USE_HTML),1)
|
||||
__help___depname = help
|
||||
endif
|
||||
@ -56,7 +59,7 @@ endif
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname)
|
||||
all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname)
|
||||
|
||||
clean:
|
||||
-if exist .\*.o del .\*.o
|
||||
@ -211,8 +214,10 @@ erase:
|
||||
event:
|
||||
$(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
ifeq ($(USE_EXCEPTIONS),1)
|
||||
except:
|
||||
$(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
|
||||
endif
|
||||
|
||||
exec:
|
||||
$(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
@ -35,6 +35,9 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
|
||||
!if "$(USE_HTML)" == "1"
|
||||
__aui___depname = sub_aui
|
||||
!endif
|
||||
!if "$(USE_EXCEPTIONS)" == "1"
|
||||
__except___depname = sub_except
|
||||
!endif
|
||||
!if "$(USE_HTML)" == "1"
|
||||
__help___depname = sub_help
|
||||
!endif
|
||||
@ -54,7 +57,7 @@ __xrc___depname = sub_xrc
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: sub_access sub_animate sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname)
|
||||
all: sub_access sub_animate sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event $(__except___depname) sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname)
|
||||
|
||||
clean:
|
||||
-if exist .\*.obj del .\*.obj
|
||||
@ -422,10 +425,12 @@ sub_event:
|
||||
$(MAKE) -f makefile.vc $(MAKEARGS) all
|
||||
cd "$(MAKEDIR)"
|
||||
|
||||
!if "$(USE_EXCEPTIONS)" == "1"
|
||||
sub_except:
|
||||
cd except
|
||||
$(MAKE) -f makefile.vc $(MAKEARGS) all
|
||||
cd "$(MAKEDIR)"
|
||||
!endif
|
||||
|
||||
sub_exec:
|
||||
cd exec
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
<subproject id="drawing" template="sub"/>
|
||||
<subproject id="erase" template="sub"/>
|
||||
<subproject id="event" template="sub"/>
|
||||
<subproject id="except" template="sub"/>
|
||||
<subproject id="except" template="sub" cond="USE_EXCEPTIONS=='1'"/>
|
||||
<subproject id="exec" template="sub"/>
|
||||
<subproject id="font" template="sub"/>
|
||||
<subproject id="grid" template="sub"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user