You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2006/12/11 14:27:11 UTC
svn commit: r485657 - in
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native:
gl/windows/makefile jpegdecoder/windows/makefile
Author: apetrenko
Date: Mon Dec 11 05:27:10 2006
New Revision: 485657
URL: http://svn.apache.org/viewvc?view=rev&rev=485657
Log:
Makefiles are changed to use compiler options from the common place
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?view=diff&rev=485657&r1=485656&r2=485657
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Mon Dec 11 05:27:10 2006
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+APPVER = 5.0 # Need WINVER=0x0500 to get HMONITOR defined.
!include <$(HY_HDK)\build\make\defines.mak>
PNG_DIR=$(HY_HDK)\..\depends\libs\build\png\# avoid continuation
@@ -22,17 +23,8 @@
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-# TOFIX: fix warning so we can use default HYCFLAGS
-# That is:
-# HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)include /I$(SHAREDSUB) \
-# /I$(PNG_DIR) /Iinclude
-# Need WINVER=0x0500 to get HMONITOR defined.
-HYCFLAGS = \
- -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
- -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0400 -D_WINSOCKAPI_ -DWINVER=0x0500 \
- $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
- /I$(SHAREDSUB)include /I$(SHAREDSUB) \
- /I$(PNG_DIR) /Iinclude
+HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)include /I$(SHAREDSUB) \
+ /I$(PNG_DIR) /Iinclude
BUILDFILES = \
BitmapSurface.obj \
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?view=diff&rev=485657&r1=485656&r2=485657
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile Mon Dec 11 05:27:10 2006
@@ -22,14 +22,7 @@
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-# TOFIX: fix warning so we can use default HYCFLAGS
-# That is:
-# HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
-HYCFLAGS = \
- -Ogityb1 -W3 -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. \
- -I$(SHAREDSUB)\include -I$(JPEG_DIR)
+HYCFLAGS = $(HYCFLAGS) -I$(SHAREDSUB)\include -I$(JPEG_DIR)
BUILDFILES = $(SHAREDSUB)JpegDecoder.obj