More Haiku fixes (gcc v2 support, actually)cf. Issue 61
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@364 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
		
							parent
							
								
									3ca05279db
								
							
						
					
					
						commit
						3d4def25f0
					
				
							
								
								
									
										6
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
									
									
									
									
								
							@ -26,7 +26,7 @@ ifdef COMSPEC
 | 
			
		||||
  MKDIR = mkdir /s
 | 
			
		||||
  BIN = grafx2.exe
 | 
			
		||||
  CFGBIN = gfxcfg.exe
 | 
			
		||||
  COPT = -W -Wall -O -g -ggdb `sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
  COPT = -W -Wall -Wdeclaration-after-statement -O -g -ggdb `sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
  LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT)
 | 
			
		||||
  CC = gcc
 | 
			
		||||
  OBJDIR = obj/win32
 | 
			
		||||
@ -83,13 +83,13 @@ else
 | 
			
		||||
      CC = i586-mingw32msvc-gcc
 | 
			
		||||
      BIN = grafx2.exe
 | 
			
		||||
      CFGBIN = gfxcfg.exe
 | 
			
		||||
      COPT = -W -Wall -O -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
      COPT = -W -Wall -Wdeclaration-after-statement -O -g -ggdb -Dmain=SDL_main `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
      LOPT = -mwindows -lmingw32 -lSDLmain -lSDL -lshlwapi `/usr/local/cross-tools/i386-mingw32/bin/sdl-config --libs` -lSDL_image $(TTFLOPT)
 | 
			
		||||
      OBJDIR = obj/win32
 | 
			
		||||
    else
 | 
			
		||||
      BIN = grafx2
 | 
			
		||||
      CFGBIN = gfxcfg
 | 
			
		||||
      COPT = -W -Wall -c -g `sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
      COPT = -W -Wall -Wdeclaration-after-statement -c -g `sdl-config --cflags` $(TTFCOPT)
 | 
			
		||||
      LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT)
 | 
			
		||||
      CC = gcc
 | 
			
		||||
      OBJDIR = obj/unix
 | 
			
		||||
 | 
			
		||||
@ -83,11 +83,11 @@ int CaractereValide(int Caractere)
 | 
			
		||||
  #else
 | 
			
		||||
  char CaracteresInterdits[] = {'/', '|', '?', '*', '<', '>'};
 | 
			
		||||
  #endif
 | 
			
		||||
  int Position;
 | 
			
		||||
  
 | 
			
		||||
  if (Caractere < ' ' || Caractere > 255)
 | 
			
		||||
    return 0;
 | 
			
		||||
  
 | 
			
		||||
  int Position;
 | 
			
		||||
  for (Position=0; Position<(long)sizeof(CaracteresInterdits); Position++)
 | 
			
		||||
    if (Caractere == CaracteresInterdits[Position])
 | 
			
		||||
      return 0;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user