Changeset 21559 for trunk/include

Timestamp:

Jan 17, 2011, 7:05:51 PM (15 years ago)

Author:

abwillis

Message:

In order to allow Odin to build with the GCC 3.3.5 and up the mk files have to be updated. Ticket #19

Location:

trunk/include

Files:

• odin32.dbg.emx.mk (modified) (1 diff)
• odin32.profile.emx.mk (modified) (3 diffs)
• odin32.rel.emx.mk (modified) (3 diffs)

trunk/include/odin32.dbg.emx.mk

@@ -23 +23 @@
 #$(EMX)\lib\stdcpp.lib \
 #$(EMX)\lib\gcc.lib \
-$(ODIN32_BASE)\src\msvcrt\libs\m.lib \
-$(EMX)\lib\iberty_s.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gcc.lib \
-$(EMX)\lib\mt\c.lib \
-$(EMX)\lib\mt\c_dllso.lib \
-$(EMX)\lib\mt\sys.lib \
-$(EMX)\lib\c_alias.lib \
-$(EMX)\lib\mt\emx.lib \
-$(EMX)\lib\emx2.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\stdcxx.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gpp.lib \
-$(EMX)\lib\stdcxx.lib \
+#$(ODIN32_BASE)\src\msvcrt\libs\m.lib \
+#$(EMX)\lib\iberty_s.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gcc.lib \
+#$(EMX)\lib\mt\c.lib \
+#$(EMX)\lib\mt\c_dllso.lib \
+#$(EMX)\lib\mt\sys.lib \
+#$(EMX)\lib\c_alias.lib \
+#$(EMX)\lib\mt\emx.lib \
+#$(EMX)\lib\emx2.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\stdcxx.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gpp.lib \
+3$(EMX)\lib\stdcxx.lib \
 #$(EMX)\lib\stdcpp.lib \
 #$(EMX)\lib\mt\c_app.lib makes trouble for crtdll \
 
-RTLLIB_O = $(EMX)\lib\mt\c_import.lib $(RTLLIB)
+#RTLLIB_O = $(EMX)\lib\mt\c_import.lib $(RTLLIB)
+RTLLIB_O = $(RTLLIB)
 RTLLIB_NRE =
 DLLENTRY = $(ODIN32_LIB)\dllentry.obj

trunk/include/odin32.profile.emx.mk

@@ -23 +23 @@
 #$(EMX)\lib\stdcpp.lib \
 #$(EMX)\lib\gcc.lib \
-$(ODIN32_BASE)\src\msvcrt\libs\m.lib \
-$(EMX)\lib\iberty_s.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gcc.lib \
-$(EMX)\lib\mt\c.lib \
-$(EMX)\lib\mt\c_dllso.lib \
-$(EMX)\lib\mt\sys.lib \
-$(EMX)\lib\c_alias.lib \
-$(EMX)\lib\mt\emx.lib \
-$(EMX)\lib\emx2.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\stdcxx.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gpp.lib \
+#$(ODIN32_BASE)\src\msvcrt\libs\m.lib \
+#$(EMX)\lib\iberty_s.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gcc.lib \
+#$(EMX)\lib\mt\c.lib \
+#$(EMX)\lib\mt\c_dllso.lib \
+#$(EMX)\lib\mt\sys.lib \
+#$(EMX)\lib\c_alias.lib \
+#$(EMX)\lib\mt\emx.lib \
+#$(EMX)\lib\emx2.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\stdcxx.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gpp.lib \
 #$(EMX)\lib\stdcpp.lib \
 #$(EMX)\lib\mt\c_app.lib makes trouble for crtdll \
 
-RTLLIB_O = $(EMX)\lib\mt\c_import.lib $(RTLLIB)
+#RTLLIB_O = $(EMX)\lib\mt\c_import.lib $(RTLLIB)
+RTLLIB_O = $(RTLLIB)
 RTLLIB_NRE =
 DLLENTRY = $(ODIN32_LIB)\dllentry.obj
@@ -102 +103 @@
 !endif
 CXXEXCEPTIONS    = -fhandle-exceptions
-CFLAGS           = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(PROFILEFLAGS) $(CTARGETFLAGS)
-CXXFLAGS         = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(PROFILEFLAGS) $(CXXTARGETFLAGS)
-CXXFLAGS_ODINCRT = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(PROFILEFLAGS) $(CXXTARGETFLAGS)
-CFLAGS_WIN32APP  = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(PROFILEFLAGS) $(CTARGETFLAGS)
-CXXFLAGS_WIN32APP= -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(PROFILEFLAGS) $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
+CFLAGS           = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(PROFILEFLAGS) $(CTARGETFLAGS)
+CXXFLAGS         = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(PROFILEFLAGS) $(CXXTARGETFLAGS)
+CXXFLAGS_ODINCRT = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(PROFILEFLAGS) $(CXXTARGETFLAGS)
+CFLAGS_WIN32APP  = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(PROFILEFLAGS) $(CTARGETFLAGS)
+CXXFLAGS_WIN32APP= -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(PROFILEFLAGS) $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
 CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
 CDEFINES         = -D__WIN32OS2__ -D__i386__ -D__WINE__ -DTCPV40HDRS -DCOMCTL32UNDOC
@@ -125 +126 @@
 !   ifdef VIO
 LDTARGETFLAGS    = -Zexe -Zstack 80
-LD2TARGETFLAGS   = /pmtype:vio /stack:$(STACKSIZE)
+LD2TARGETFLAGS   = 
 !   else
 LDTARGETFLAGS    = -Zexe -Zstack 80
-LD2TARGETFLAGS   = /pmtype:pm  /stack:$(STACKSIZE)
+LD2TARGETFLAGS   = 
 !   endif
 !else

trunk/include/odin32.rel.emx.mk

@@ -23 +23 @@
 #$(EMX)\lib\stdcpp.lib \
 #$(EMX)\lib\gcc.lib \
-$(ODIN32_BASE)\src\msvcrt\libs\m.lib \
-$(EMX)\lib\iberty_s.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gcc.lib \
-$(EMX)\lib\mt\c.lib \
-$(EMX)\lib\mt\c_dllso.lib \
-$(EMX)\lib\mt\sys.lib \
-$(EMX)\lib\c_alias.lib \
-$(EMX)\lib\mt\emx.lib \
-$(EMX)\lib\emx2.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\stdcxx.lib \
-$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gpp.lib \
+#$(ODIN32_BASE)\src\msvcrt\libs\m.lib \
+#$(EMX)\lib\iberty_s.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gcc.lib \
+#$(EMX)\lib\mt\c.lib \
+#$(EMX)\lib\mt\c_dllso.lib \
+#$(EMX)\lib\mt\sys.lib \
+#$(EMX)\lib\c_alias.lib \
+#$(EMX)\lib\mt\emx.lib \
+#$(EMX)\lib\emx2.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\stdcxx.lib \
+#$(EMX)\lib\gcc-lib\i386-pc-os2_emx\3.0.3\mt\gpp.lib \
 #$(EMX)\lib\stdcpp.lib \
 #$(EMX)\lib\mt\c_app.lib makes trouble for crtdll \
 
-RTLLIB_O = $(EMX)\lib\mt\c_import.lib $(RTLLIB)
+#RTLLIB_O = $(EMX)\lib\mt\c_import.lib $(RTLLIB)
+RTLLIB_O = $(RTLLIB)
 RTLLIB_NRE =
 DLLENTRY = $(ODIN32_LIB)\dllentry.obj
@@ -87 +88 @@
 !endif
 CXXEXCEPTIONS    = -fhandle-exceptions
-CFLAGS           = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(CTARGETFLAGS)
-CXXFLAGS         = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(CXXTARGETFLAGS)
-CXXFLAGS_ODINCRT = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(CXXTARGETFLAGS)
-CFLAGS_WIN32APP  = -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(CTARGETFLAGS)
-CXXFLAGS_WIN32APP= -Zomf -pipe -Wall -Zmt -g -O6 -mcpu=pentium $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
+CFLAGS           = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(CTARGETFLAGS)
+CXXFLAGS         = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(CXXTARGETFLAGS)
+CXXFLAGS_ODINCRT = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(CXXTARGETFLAGS)
+CFLAGS_WIN32APP  = -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(CTARGETFLAGS)
+CXXFLAGS_WIN32APP= -Zomf -Zhigh-mem -pipe -Wall -Zmt -g -O6 -mtune=pentium $(CXXTARGETFLAGS) $(CXXEXCEPTIONS)
 CINCLUDES        = -I$(ODIN32_INCLUDE)\Win -I. -I$(ODIN32_INCLUDE)
 CDEFINES         = -D__WIN32OS2__ -D__WINE__ -D__i386__ -DTCPV40HDRS -DCOMCTL32UNDOC
@@ -110 +111 @@
 !   ifdef VIO
 LDTARGETFLAGS    = -Zexe -Zstack 80
-LD2TARGETFLAGS   = /pmtype:vio /stack:$(STACKSIZE)
+LD2TARGETFLAGS   = 
 !   else
 LDTARGETFLAGS    = -Zexe -Zstack 80
-LD2TARGETFLAGS   = /pmtype:pm  /stack:$(STACKSIZE)
+LD2TARGETFLAGS   = 
 !   endif
 !else