Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9694 → Rev 9695

/programs/develop/cmm/Makefile
2,8 → 2,8
 
Compiler = gcc
 
Compiler_Options = -m32 -c -fno-exceptions -D_UNIX_
#Compiler_Options = -c -fno-exceptions -O2 -D_WIN32_
Compiler_Options = -m32 -c -fpack-struct=2 -fno-exceptions -D_UNIX_
#Compiler_Options = -c -fpack-struct=2 -fno-exceptions -O2 -D_WIN32_
 
#-D: _WIN32_ or _UNIX_
#-D: for _WIN32_ add -D__CONSOLE__
/programs/develop/cmm/Makefile.lin32
1,4 → 1,4
CPPFLAGS=-m32 -fno-exceptions -std=c++03 -Wno-write-strings -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DO_BINARY=0 -D_UNIX_
CPPFLAGS=-m32 -fpack-struct=2 -fno-exceptions -std=c++03 -Wno-write-strings -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp -DO_BINARY=0 -D_UNIX_
LDFLAGS=-m32
 
OBJS=$(patsubst %.cpp, %.o, $(wildcard *.cpp))
/programs/develop/cmm/Makefile.win
1,7 → 1,7
Compiler = gcc
 
#Compiler_Options = -c -fno-exceptions -D_UNIX_
Compiler_Options = -c -fno-exceptions -O2 -D_WIN32_
#Compiler_Options = -c -fpack-struct=2 -fno-exceptions -D_UNIX_
Compiler_Options = -c -fpack-struct=2 -fno-exceptions -O2 -D_WIN32_
 
#-D: _WIN32_ or _UNIX_
#-D: for _WIN32_ add -D__CONSOLE__
/programs/develop/cmm/Makefile.win32
1,4 → 1,4
CPPFLAGS=-m32 -fno-exceptions -std=c++03 -Wno-write-strings -D_WIN32_
CPPFLAGS=-m32 -fpack-struct=2 -fno-exceptions -std=c++03 -Wno-write-strings -D_WIN32_
LDFLAGS=-m32
 
OBJS=$(patsubst %.cpp, %.o, $(wildcard *.cpp))
/programs/develop/cmm/MakefileKolibriOS
7,7 → 7,7
 
Compatib_Posix = -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp
 
Compiler_Options = -c -fno-exceptions -D_KOS_ -U_Win32 -U_WIN32 -U__MINGW32__ \
Compiler_Options = -c -fpack-struct=2 -fno-exceptions -D_KOS_ -U_Win32 -U_WIN32 -U__MINGW32__ \
-mno-ms-bitfields -Wno-write-strings $(Includes) $(Compatib_Posix)
 
Exe_file = cmm.kex
/programs/develop/cmm/MakefileUnixWin
1,7 → 1,7
Compiler = gcc
 
Compiler_Options = -c -m32 -fno-exceptions -D_UNIX_
#Compiler_Options = -c -fno-exceptions -O2 -D_WIN32_
Compiler_Options = -c -m32 -fpack-struct=2 -fno-exceptions -D_UNIX_
#Compiler_Options = -c -fpack-struct=2 -fno-exceptions -O2 -D_WIN32_
 
#-D: _WIN32_ or _UNIX_
#-D: for _WIN32_ add -D__CONSOLE__
/programs/develop/cmm/Makefile_pyakov_ubuntu32
1,8 → 1,8
Compiler = gcc
 
Compatib_Posix = -Dstricmp=strcasecmp -Dstrnicmp=strncasecmp
Compiler_Options = -m32 -c -fno-exceptions -D_UNIX_ $(Compatib_Posix) -Wno-narrowing
#Compiler_Options = -c -fno-exceptions -O2 -D_WIN32_
Compiler_Options = -m32 -c -fpack-struct=2 -fno-exceptions -D_UNIX_ $(Compatib_Posix) -Wno-narrowing
#Compiler_Options = -c -fpack-struct=2 -fno-exceptions -O2 -D_WIN32_
 
#-D: _WIN32_ or _UNIX_
#-D: for _WIN32_ add -D__CONSOLE__
/programs/develop/cmm/toke.cpp
4265,6 → 4265,9
 
if((sobj||fobj)&&strcmp((char *)string+2,"OBJ__")==0)return TRUE;
 
// Added by Coldy (for mark MSCOFF build)
if ((ocoff&&sobj) && strcmp((char *)string + 2, "COFF__") == 0)return TRUE;
 
if(comfile==file_exe){
 
if(modelmem==TINY){