Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add generic dialogs in non wxUniversal builds. Regenerated makefiles.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-06-15 14:39:38 +00:00
parent d2b98e9537
commit 63c839616a
8 changed files with 309 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/dialogs/makefile.bcc
View File

@@ -30,7 +30,8 @@ DIALOGS_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS)
DIALOGS_OBJECTS = \
$(OBJS)\dialogs_dialogs.obj
$(OBJS)\dialogs_dialogs.obj \
$(____GENERIC_FILES_FILENAMES_OBJECTS)
### Conditionally set variables: ###
@@ -103,6 +104,12 @@ __DLLFLAG_p = -DWXUSINGDLL
!if "$(SHARED)" == "1"
__DLLFLAG_p_1 = -dWXUSINGDLL
!endif
!if "$(WXUNIV)" == "0"
____GENERIC_FILES_FILENAMES_OBJECTS = \
$(OBJS)\dialogs_colrdlgg.obj \
$(OBJS)\dialogs_dirdlgg.obj \
$(OBJS)\dialogs_fontdlgg.obj
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_ADV_p = \
wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
@@ -180,5 +187,14 @@ data:
$(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
$(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
$(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
$(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
$(OBJS)\dialogs_dialogs.res: .\dialogs.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 $**