forgot to commit some regenerated files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -20,22 +20,26 @@ BCCDIR = $(MAKEDIR)\..
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = \
|
||||
.\..\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
TEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
|
||||
$(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__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)
|
||||
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \
|
||||
-I.\..\..\..\include $(CXXFLAGS)
|
||||
TEST_OBJECTS = \
|
||||
$(OBJS)\test_test.obj
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
LIBDIRNAME = .\..\..\..\..\lib\bcc_lib$(CFG)
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
LIBDIRNAME = .\..\..\..\..\lib\bcc_dll$(CFG)
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "0"
|
||||
PORTNAME = base
|
||||
!endif
|
||||
@@ -120,6 +124,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
|
||||
!if "$(UNICODE)" == "1"
|
||||
__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
|
||||
!endif
|
||||
!if "$(MSLU)" == "1"
|
||||
__UNICOWS_LIB_p = unicows.lib
|
||||
!endif
|
||||
!if "$(MONOLITHIC)" == "0"
|
||||
__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
|
||||
!endif
|
||||
@@ -138,8 +145,6 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
|
||||
!endif
|
||||
|
||||
MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
|
||||
|
||||
|
||||
all: $(OBJS)
|
||||
$(OBJS):
|
||||
@@ -150,7 +155,7 @@ $(OBJS):
|
||||
all: $(OBJS)\test.exe
|
||||
|
||||
$(OBJS)\test_sample.res: .\..\..\..\..\samples\sample.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$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) $**
|
||||
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 $**
|
||||
|
||||
$(OBJS)\test_test.obj: .\test.cpp
|
||||
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $**
|
||||
@@ -161,6 +166,6 @@ clean:
|
||||
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
|
||||
|
||||
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(TEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\test_sample.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(TEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\test_sample.res
|
||||
|
|
||||
|
||||
@@ -12,17 +12,14 @@ include ../../../../build/msw/config.gcc
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = \
|
||||
.\..\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__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)
|
||||
$(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. \
|
||||
$(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS)
|
||||
TEST_OBJECTS = \
|
||||
$(OBJS)\test_sample_rc.o \
|
||||
$(OBJS)\test_test.o
|
||||
@@ -32,6 +29,12 @@ TEST_OBJECTS = \
|
||||
ifeq ($(GCC_VERSION),2.95)
|
||||
GCCFLAGS = -fvtable-thunks
|
||||
endif
|
||||
ifeq ($(SHARED),0)
|
||||
LIBDIRNAME = .\..\..\..\..\lib\gcc_lib$(CFG)
|
||||
endif
|
||||
ifeq ($(SHARED),1)
|
||||
LIBDIRNAME = .\..\..\..\..\lib\gcc_dll$(CFG)
|
||||
endif
|
||||
ifeq ($(USE_GUI),0)
|
||||
PORTNAME = base
|
||||
endif
|
||||
@@ -114,6 +117,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
|
||||
@@ -132,8 +138,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):
|
||||
@@ -144,7 +148,7 @@ $(OBJS):
|
||||
all: $(OBJS)\test.exe
|
||||
|
||||
$(OBJS)\test_sample_rc.o: .\..\..\..\..\samples\sample.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)
|
||||
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
|
||||
|
||||
$(OBJS)\test_test.o: .\test.cpp
|
||||
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
|
||||
@@ -154,6 +158,6 @@ clean:
|
||||
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
|
||||
|
||||
$(OBJS)\test.exe: $(TEST_OBJECTS) $(OBJS)\test_sample_rc.o
|
||||
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $(__WXLIB_CORE_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 $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $(__WXLIB_CORE_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
|
||||
|
||||
Reference in New Issue
Block a user