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

Fixed TARGETDEF usage. Now defined in the parent make to use include a DEF file in the build. Is there some better way of doing this ?

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2003-04-09 13:19:40 +00:00
parent 6d460f765d
commit 1eb9ddb9f8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/makeprog.b32
View File

@@ -5,8 +5,9 @@
# Updated: # Updated:
# Copyright: # Copyright:
# #
# Include file for samples and utilities. Set TARGET and OBJECTS # Include file for samples and utilities. Set TARGET, OBJECTS and
# before including this file. # TARGETDEF (if you want to include a DEF file in the build) before
# including this file.
# WXWIN set by parent make # WXWIN set by parent make
# BCCDIR set in makeb32.env # BCCDIR set in makeb32.env
@@ -21,9 +22,13 @@ IMGLIBS= winpng jpeg tiff
!endif !endif
!if "$(WXUSINGDLL)" == "1" !if "$(WXUSINGDLL)" == "1"
LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS) odbc32 LIBS=$(WXLIB) $(EXTRALIBS) cw32mti import32 ole2w32 regex zlib $(IMGLIBS)
!else !else
LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS) odbc32 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 regex zlib $(IMGLIBS)
!endif
!if "$(wxUSE_ODBC)" == "1"
LIBS=$(LIBS) odbc32
!endif !endif
# Note: you may need to remove some libraries for earlier versions of BC++, as below # Note: you may need to remove some libraries for earlier versions of BC++, as below
@@ -49,12 +54,10 @@ DEBUG_FLAGS =
CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT) CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT)
TARGETDEF =
!if "$(wxUSE_GUI)" == "0" !if "$(wxUSE_GUI)" == "0"
TARGETRES = TARGETRES =
STARTUP = c0x32.obj STARTUP = c0x32.obj
!else !else
if exist $(TARGET).def TARGETDEF = $(TARGET).def
TARGETRES = $(TARGET).res TARGETRES = $(TARGET).res
STARTUP = c0w32.obj STARTUP = c0w32.obj
!endif !endif
@@ -67,7 +70,7 @@ $(STARTUP) $(OBJECTS)
$(TARGET) $(TARGET)
nul nul
$(LIBS) $(LIBS)
$(TARGETDEF)
$(TARGETRES) $(TARGETRES)
! !