WebSVN – Kolibri OS – Path Comparison – / – /programs/develop/cmm/ Rev 9701 and /programs/develop/cmm/ Rev 9702

Regard whitespace Rev 9701 → Rev 9702

/programs/develop/cmm/Makefile_pyakov_ubuntu32
File deleted

Property changes:
Deleted: svn:executable
-*
\ No newline at end of property

 /programs/develop/cmm/Makefile.lin32
 ,8 → 3,13
 OBJS=$(patsubst %.cpp, %.o, $(wildcard *.cpp))
-c--: $(OBJS)
-        g++ $(LDFLAGS) $^ -o $@
+TARGET = c--
+$(TARGET): $(OBJS)
+        $(CC) $(LDFLAGS) $^ -o $@
 %.o: %.cpp
-        g++ $(CPPFLAGS) -c $<
+        $(CC) $(CPPFLAGS) -c $<
+clean:
+        rm -f $(OBJS) $(TARGET)

 /programs/develop/cmm/Makefile.win32
 ,10 → 1,17
-CPPFLAGS=-m32 -fpack-struct=2 -fno-exceptions -std=c++03 -Wno-write-strings -D_WIN32_
+CC = i686-w64-mingw32-gcc
+CPPFLAGS = -m32 -fpack-struct=2 -fno-exceptions -std=c++03 -Wno-write-strings -D_WIN32_ -DO_BINARY=0
 LDFLAGS=-m32
 OBJS=$(patsubst %.cpp, %.o, $(wildcard *.cpp))
-c--.exe: $(OBJS)
-        g++ $^ -o $@
+TARGET = c--.exe
+$(TARGET): $(OBJS)
+        $(CC) $(LDFLAGS) $^ -o $@
 %.o: %.cpp
-        g++ $(CPPFLAGS) -c $<
+        $(CC) $(CPPFLAGS) -c $<
+clean:
+        rm -f $(OBJS) $(TARGET)

 /programs/develop/cmm/main.cpp
 ,7 → 36,7
 FILE *hout=NULL;
 const char *namestartupfile="startup.h--";
-char outext[4]="kex";
+char outext[4] = "com";
 short extflag=TRUE;//ðàñøèðåíèå ìîæíî ïðèñâîèòü
 //int scrsize;
 unsigned char gwarning=FALSE;
 ,8 → 301,8
                 LoadIni((char *)"c--.ini");
                 for(count=1;count<argc;count++){ //îáðàáîòêà êîìàíäíîé ñòðîêè
-                        //if(argv[count][0]=='/'||argv[count][0]=='-'){
-                        if(argv[count][0]=='-'){
+                        if(argv[count][0]=='/'||argv[count][0]=='-'){
+                        //if(argv[count][0]=='-'){
                                 if(SelectComand(argv[count]+1,&count)==c_end) BadCommandLine(argv[count]);
                         }
                         else{
 ,7 → 1721,12
 {
 char buf[256];
 FILE *diskout;
+    if(!ext && strlen(ext)) {
         sprintf(buf,"%s.%s",rawfilename,ext);
+    } else {
+        strcpy(buf, rawfilename);
+    }
         if((diskout=fopen(buf,mode))==NULL){
                 ErrOpenFile(buf);
                 exit(e_notcreateoutput);

 /programs/develop/cmm/port.h
 ,15 → 92,13
 #else
-int stricmp(const char*, const char*); //Leency
-int strnicmp(const char*, const char*, int); //Leency
+//int stricmp(const char*, const char*); //Leency
+//int strnicmp(const char*, const char*, int); //Leency
 #endif
 char* strupr(char* s);
 char* strlwr(char* s);
-//int stricmp(const char*, const char*); //Leency
-//int strnicmp(const char*, const char*, int); //Leency
 #ifdef _PORT_CPP_