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

16
samples/dialogs/makefile.gcc
View File

@@ -23,6 +23,7 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
DIALOGS_OBJECTS = \
$(OBJS)\dialogs_dialogs.o \
$(____GENERIC_FILES_FILENAMES_OBJECTS) \
$(OBJS)\dialogs_dialogs_rc.o
### Conditionally set variables: ###
@@ -105,6 +106,12 @@ endif
ifeq ($(SHARED),1)
__DLLFLAG_p_1 = --define WXUSINGDLL
endif
ifeq ($(WXUNIV),0)
____GENERIC_FILES_FILENAMES_OBJECTS = \
$(OBJS)\dialogs_colrdlgg.o \
$(OBJS)\dialogs_dirdlgg.o \
$(OBJS)\dialogs_fontdlgg.o
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_ADV_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
@@ -178,6 +185,15 @@ data:
$(OBJS)\dialogs_dialogs.o: ./dialogs.cpp
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
$(OBJS)\dialogs_colrdlgg.o: ./../../src/generic/colrdlgg.cpp
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
$(OBJS)\dialogs_dirdlgg.o: ./../../src/generic/dirdlgg.cpp
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
$(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp
$(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $<
$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples