Changeset 21560 for trunk/src

Timestamp:

Jan 17, 2011, 7:14:06 PM (15 years ago)

Author:

abwillis

Message:

Changes to get pe.exe and pec.exe to build with GCC, ticket #19 and ticket #22.

Location:

trunk/src/peldr

Files:

• makefile (modified) (1 diff)
• pe.mak (modified) (3 diffs)
• pec.mak (modified) (4 diffs)

trunk/src/peldr/makefile

@@ -6 +6 @@
 #       pe.exe and pec.exe makefile
 #
-
+CCENV = EMX
 
 #

trunk/src/peldr/pe.mak

@@ -10 +10 @@
 # Tell that we're producing an executable
 #
+CCENV = EMX
 STACKSIZE = 0x100000
 EXETARGET = 1
@@ -24 +25 @@
 # Overrides.
 #
+!if "$(VAC3)" == "1" || "$(VAC36)" == "1" || "$(WAT)" == "1"
 CXXFLAGS    = $(CXXFLAGS_ODINCRT)
 LD2FLAGS    = $(LD2FLAGS_ODINCRT)
+!else
+CXXFLAGS    = -I$(ODIN32_INCLUDE)\emxruntime $(CXXFLAGS_ODINCRT) -I/compilers/gcc440/local452/include -I/os2tk45/h
+LD2FLAGS    = $(LD2FLAGS_ODINCRT) -L/os2tk45/lib
+!endif
 
 #
@@ -39 +45 @@
 LIBS = \
 $(RTLLIB_O) \
-os2386.lib
+"/os2tk45/lib/os2386.lib"
 
 

trunk/src/peldr/pec.mak

@@ -10 +10 @@
 # Tell that we're producing an executable
 #
+CCENV = EMX
 STACKSIZE = 0x100000
 VIO = 1
@@ -24 +25 @@
 # Overrides.
 #
-CXXFLAGS    = $(CXXFLAGS_ODINCRT)
-LD2FLAGS    = $(LD2FLAGS_ODINCRT)
+CXXFLAGS    = $(CXXFLAGS_ODINCRT) -I/compilers/gcc440/local452/include -I/os2tk45/h
+LD2FLAGS    = $(LD2FLAGS_ODINCRT) -L/os2tk45/lib
 
 
@@ -40 +41 @@
 LIBS = \
 $(RTLLIB_O) \
-os2386.lib
+"\os2tk45\lib\os2386.lib"
 
 
@@ -60 +61 @@
 $(OBJDIR)\pec.obj: pe.cpp
 !if "$(VAC3)" == "1" || "$(VAC36)" == "1" || "$(WAT)" == "1"
-    $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -DCOMMAND_LINE_VERSION -Fo$@ $**
+        $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -DCOMMAND_LINE_VERSION -Fo$@ $**
 !else
-!error Compiler not supported yet
+        $(CXX) $(CXXFLAGS) $(CINCLUDES) $(CDEFINES) -DCOMMAND_LINE_VERSION -o $@ -c $**
+#!error Compiler not supported yet
 !endif