change MSW libs directories so that libraries are shared by builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -35,10 +35,8 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
|
||||
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
|
||||
-I$(srcdir)/../../../include $(CXXFLAGS)
|
||||
-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
|
||||
-I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS)
|
||||
OGLEDIT_OBJECTS = \
|
||||
ogledit_studio.o \
|
||||
ogledit_doc.o \
|
||||
@@ -51,6 +49,7 @@ OGLEDIT_OBJECTS = \
|
||||
ogledit_dialogs.o \
|
||||
ogledit_csprint.o \
|
||||
$(__ogledit___win32rc)
|
||||
WX_VERSION = 2.5.0
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@@ -66,34 +65,6 @@ OGLEDIT_OBJECTS = \
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_2 = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ --include-dir $(top_srcdir)/src/expat/lib
|
||||
@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
|
||||
@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
|
||||
@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \
|
||||
@COND_WXUSE_LIBJPEG_BUILTIN@ --include-dir $(top_srcdir)/src/jpeg
|
||||
@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
|
||||
@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
|
||||
@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \
|
||||
@COND_WXUSE_ODBC_BUILTIN@ --include-dir $(top_srcdir)/src/odbc
|
||||
@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
|
||||
@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
|
||||
@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \
|
||||
@COND_WXUSE_LIBPNG_BUILTIN@ --include-dir $(top_srcdir)/src/png
|
||||
@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
|
||||
@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
|
||||
@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \
|
||||
@COND_WXUSE_REGEX_BUILTIN@ --include-dir $(top_srcdir)/src/regex
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \
|
||||
@COND_WXUSE_LIBTIFF_BUILTIN@ --include-dir $(top_srcdir)/src/tiff
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ --include-dir $(top_srcdir)/src/zlib
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@@ -112,9 +83,7 @@ OGLEDIT_OBJECTS = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
|
||||
$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
|
||||
$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \
|
||||
$(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
@@ -175,7 +144,7 @@ ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/ogledit/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
-e "s/VERSION/$(WX_VERSION)/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist
|
||||
|
||||
|
||||
@@ -215,7 +184,7 @@ ogledit_studio.o: $(srcdir)/studio.cpp
|
||||
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
|
||||
|
||||
ogledit_studio_rc.o: $(srcdir)/studio.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include
|
||||
|
||||
ogledit_symbols.o: $(srcdir)/symbols.cpp
|
||||
$(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
|
||||
|
@@ -20,16 +20,12 @@ BCCDIR = $(MAKEDIR)\..
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = \
|
||||
.\..\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLEDIT_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..\..\..\..\samples \
|
||||
-I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \
|
||||
-I.\..\..\..\include $(CXXFLAGS)
|
||||
OGLEDIT_OBJECTS = \
|
||||
$(OBJS)\ogledit_studio.obj \
|
||||
@@ -42,9 +38,17 @@ OGLEDIT_OBJECTS = \
|
||||
$(OBJS)\ogledit_project.obj \
|
||||
$(OBJS)\ogledit_dialogs.obj \
|
||||
$(OBJS)\ogledit_csprint.obj
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
|
||||
### 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
|
||||
@@ -184,7 +188,7 @@ $(OBJS)\ogledit_studio.obj: .\studio.cpp
|
||||
$(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\ogledit_studio.res: .\studio.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) -i..\..\..\..\samples -i.\..\..\..\include $**
|
||||
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 -i.\..\..\..\include $**
|
||||
|
||||
$(OBJS)\ogledit_symbols.obj: .\symbols.cpp
|
||||
$(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
|
||||
@@ -202,6 +206,6 @@ data:
|
||||
for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&|
|
||||
c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.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)\ogledit_studio.res
|
||||
|
|
||||
|
@@ -12,18 +12,14 @@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = \
|
||||
.\..\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = \
|
||||
vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
|
||||
/DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\ogledit.pdb $(____DEBUGRUNTIME_2_p) \
|
||||
$(__OPTIMIZEFLAG_4) /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) /D_WINDOWS \
|
||||
/I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)
|
||||
$(__UNICODE_DEFINE_p) /I.\..\..\..\..\include /I$(SETUPHDIR) /I. \
|
||||
$(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples /I.\..\..\..\include \
|
||||
$(CXXFLAGS)
|
||||
OGLEDIT_OBJECTS = \
|
||||
$(OBJS)\ogledit_studio.obj \
|
||||
$(OBJS)\ogledit_doc.obj \
|
||||
@@ -36,9 +32,17 @@ OGLEDIT_OBJECTS = \
|
||||
$(OBJS)\ogledit_dialogs.obj \
|
||||
$(OBJS)\ogledit_csprint.obj \
|
||||
$(OBJS)\ogledit_studio.res
|
||||
SETUPHDIR = \
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
!if "$(SHARED)" == "0"
|
||||
LIBDIRNAME = .\..\..\..\..\lib\vc_lib$(CFG)
|
||||
!endif
|
||||
!if "$(SHARED)" == "1"
|
||||
LIBDIRNAME = .\..\..\..\..\lib\vc_dll$(CFG)
|
||||
!endif
|
||||
!if "$(USE_GUI)" == "0"
|
||||
PORTNAME = base
|
||||
!endif
|
||||
@@ -247,7 +251,7 @@ $(OBJS)\ogledit_studio.obj: .\studio.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
|
||||
|
||||
$(OBJS)\ogledit_studio.res: .\studio.rc
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /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) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**
|
||||
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /i .\..\..\..\include $**
|
||||
|
||||
$(OBJS)\ogledit_symbols.obj: .\symbols.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
|
||||
@@ -265,6 +269,6 @@ data:
|
||||
for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
||||
|
||||
$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
|
||||
$(OGLEDIT_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.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) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
|
||||
<<
|
||||
|
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
LIBDIRNAME =
|
||||
!ifeq SHARED 0
|
||||
LIBDIRNAME = .\..\..\..\..\lib\wat_lib$(CFG)
|
||||
!endif
|
||||
!ifeq SHARED 1
|
||||
LIBDIRNAME = .\..\..\..\..\lib\wat_dll$(CFG)
|
||||
!endif
|
||||
PORTNAME =
|
||||
!ifeq USE_GUI 0
|
||||
PORTNAME = base
|
||||
@@ -153,17 +160,12 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
|
||||
|
||||
### Variables: ###
|
||||
|
||||
LIBDIRNAME = &
|
||||
.\..\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OBJS = &
|
||||
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
|
||||
$(__RUNTIME_LIBS_5) -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=..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)
|
||||
$(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. &
|
||||
$(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)
|
||||
OGLEDIT_OBJECTS = &
|
||||
$(OBJS)\ogledit_studio.obj &
|
||||
$(OBJS)\ogledit_doc.obj &
|
||||
@@ -175,6 +177,8 @@ OGLEDIT_OBJECTS = &
|
||||
$(OBJS)\ogledit_project.obj &
|
||||
$(OBJS)\ogledit_dialogs.obj &
|
||||
$(OBJS)\ogledit_csprint.obj
|
||||
SETUPHDIR = &
|
||||
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
||||
|
||||
|
||||
all : $(OBJS)
|
||||
@@ -210,7 +214,7 @@ $(OBJS)\ogledit_studio.obj : .AUTODEPEND .\studio.cpp
|
||||
$(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\ogledit_studio.res : .AUTODEPEND .\studio.rc
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -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=..\..\..\..\samples -i=.\..\..\..\include $<
|
||||
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $<
|
||||
|
||||
$(OBJS)\ogledit_symbols.obj : .AUTODEPEND .\symbols.cpp
|
||||
$(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $<
|
||||
@@ -233,7 +237,7 @@ $(OBJS)\ogledit.exe : $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
|
||||
@%create $(OBJS)\ogledit.lbc
|
||||
@%append $(OBJS)\ogledit.lbc option quiet
|
||||
@%append $(OBJS)\ogledit.lbc name $^@
|
||||
@%append $(OBJS)\ogledit.lbc option incremental
|
||||
@%append $(OBJS)\ogledit.lbc option caseexact
|
||||
@%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
|
||||
@for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i
|
||||
@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.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 kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\ogledit.lbc library %i
|
||||
|
Reference in New Issue
Block a user