harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r485656 - /harmony/enhanced/classlib/trunk/depends/build/defines.mak
Date Mon, 11 Dec 2006 13:25:42 GMT
Author: apetrenko
Date: Mon Dec 11 05:25:39 2006
New Revision: 485656

URL: http://svn.apache.org/viewvc?view=rev&rev=485656
Log:
Implementation of debug/release switch for Windows native build

Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mak

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?view=diff&rev=485656&r1=485655&r2=485656
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Mon Dec 11 05:25:39 2006
@@ -13,7 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-APPVER=4.0
+!ifndef APPVER
+APPVER=4.0 #Default Windows version
+!endif
+
 TARGETOS=WIN95
 _WIN32_IE=0x0500
 SEHMAP = TRUE
@@ -24,7 +27,21 @@
 DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
 SHAREDSUB=..\shared\# ditto
 
-HYCFLAGS = \
-  -Ogityb1 -WX -GF -Gs -MD -Zi -Zm400 \
-  -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0400 \
-  $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
+HYCOMMONCFLAGS = \
+  -WX -GF -Gs -MD -Zm400 \
+  -D_DLL -D_MT -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ \
+  /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
+  
+HYDEBUGCFLAGS = \
+  -Zi
+  
+HYRELEASECFLAGS = \
+  -Ogityb1  
+
+!IF "$(HY_CFG)" == "debug"
+HYCFLAGS = $(HYDEBUGCFLAGS) $(HYCOMMONCFLAGS)
+!ELSE  
+HYCFLAGS = $(HYRELEASECFLAGS) $(HYCOMMONCFLAGS)
+!ENDIF
+  
+  



Mime
View raw message