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

1) some compilers (Watcom) don't like it if wxBase library PCH file contains

Browse Source 
symbols from GUI components and won't link a DLL
2) fixed subdirs recursion code - all options must be output
3) fixed subdirs recursion code - all options must be output
4) fix for watcom resource compiler


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-08 12:59:30 +00:00
parent cbba971f2f
commit 2265a2d51e
178 changed files with 8215 additions and 7995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/samples/xrc/makefile.gcc
View File

@@ -21,7 +21,7 @@ XRCDEMO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
$(__UNICODE_DEFINE_p) -I.\..\..\..\include -I$(LIBDIRNAME) \
-I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
-I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I.\..\..\..\src\expat\lib -I. \
$(__DLLFLAG_p) -I.\..\..\include $(CXXFLAGS)
$(__DLLFLAG_p) -I..\..\..\samples -I.\..\..\include $(CXXFLAGS)
XRCDEMO_OBJECTS = \
$(OBJS)\xrcdemo_xrcdemo.o \
$(OBJS)\xrcdemo_myframe.o \
@@ -116,6 +116,9 @@ endif
ifeq ($(UNICODE),1)
__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
endif
ifeq ($(MSLU),1)
__UNICOWS_LIB_p = -lunicows
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
endif
@@ -141,8 +144,6 @@ ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
endif
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
all: $(OBJS)
$(OBJS):
@@ -165,17 +166,17 @@ $(OBJS)\xrcdemo_xrcdemo.o: .\xrcdemo.cpp
$(CXX) -c -o $@ $(XRCDEMO_CXXFLAGS) $<
$(OBJS)\xrcdemo_xrcdemo_rc.o: .\xrcdemo.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 $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../include
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 $(LIBDIRNAME) --include-dir ./../../../src/tiff --include-dir ./../../../src/jpeg --include-dir ./../../../src/png --include-dir ./../../../src/zlib --include-dir ./../../../src/regex --include-dir ./../../../src/expat/lib --include-dir . $(__DLLFLAG_p_1) --include-dir ../../../samples --include-dir ./../../include
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\xrcdemo.exe del $(OBJS)\xrcdemo.exe
data:
if not exist $(OBJS)/rc mkdir $(OBJS)/rc
for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)/rc\%%f copy ./rc\%%f $(OBJS)/rc
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
for %%f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc scanning.gif sppicon.ico toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_xrcdemo_rc.o
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
$(CXX) -o $@ $(XRCDEMO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xrc $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_XML_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
.PHONY: all clean data