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/12 17:37:10 UTC
svn commit: r486221 -
/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
Author: apetrenko
Date: Tue Dec 12 08:37:09 2006
New Revision: 486221
URL: http://svn.apache.org/viewvc?view=rev&rev=486221
Log:
Makefile is changed to use compiler options from the common place
Modified:
harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile?view=diff&rev=486221&r1=486220&r2=486221
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile Tue Dec 12 08:37:09 2006
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+TARGETOS = WINNT # Need _WIN32_WINNT=0x0500 to get GLYPHSET defined.
+APPVER = 5.0
!include <$(HY_HDK)\build\make\defines.mak>
LIBBASE=fontlib
@@ -20,12 +22,7 @@
LIBNAME=$(LIBPATH)$(LIBBASE).lib
HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
-# TOFIX: fix warning so we can use default HYCFLAGS -WX
-HYCFLAGS = \
- -Ogityb1 -W3 -GF -Gs -MD -Zi -Zm400 \
- -D_DLL -D_MT -DWIN32 -D_WIN32_WINNT=0x0501 -D_WINSOCKAPI_ -DWINVER=0x0400 \
- $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
- /Iinclude /I..\..\gl\windows\include \
+HYCFLAGS = $(HYCFLAGS) /Iinclude /I..\..\gl\windows\include \
-DUNICODE -D_UNICODE
BUILDFILES = winFont.obj