Permalink
Browse files

Fixed and modernized

  • Loading branch information...
1 parent 761c988 commit f56a7ab059c60efd917e3b889d23f044f22df40e @svenstaro committed Nov 11, 2011
Showing with 7 additions and 300 deletions.
  1. +1 −0 .gitignore
  2. +2 −0 Makefile
  3. +0 −67 infinerator.cbp
  4. +0 −213 infinerator.depend
  5. +0 −7 infinerator.layout
  6. BIN infinterator
  7. +0 −6 infinterator.workspace
  8. +4 −7 main.cpp
View
@@ -0,0 +1 @@
+*.bin
View
@@ -0,0 +1,2 @@
+default:
+ g++ -Ofast $(shell sdl-config --cflags --libs) -lboost_program_options -lboost_regex -std=c++0x main.cpp -oinfinerator.bin
View
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
- <FileVersion major="1" minor="6" />
- <Project>
- <Option title="infinerator" />
- <Option pch_mode="2" />
- <Option compiler="gcc" />
- <Build>
- <Target title="Debug">
- <Option output="bin/Debug/infinerator" prefix_auto="1" extension_auto="1" />
- <Option object_output="obj/Debug/" />
- <Option type="1" />
- <Option compiler="gcc" />
- <Compiler>
- <Add option="-g" />
- </Compiler>
- </Target>
- <Target title="Release">
- <Option output="bin/Release/infinerator" prefix_auto="1" extension_auto="1" />
- <Option object_output="obj/Release/" />
- <Option type="1" />
- <Option compiler="gcc" />
- <Option use_console_runner="0" />
- <Compiler>
- <Add option="-march=prescott" />
- <Add option="-O2" />
- </Compiler>
- <Linker>
- <Add option="-s" />
- </Linker>
- </Target>
- <Target title="Release Mingw32">
- <Option output="bin/Release/infinerator" prefix_auto="1" extension_auto="0" />
- <Option working_dir="bin/Release" />
- <Option object_output="obj/Release/" />
- <Option type="1" />
- <Option compiler="mingw32_compiler" />
- <Option use_console_runner="0" />
- <Option projectLinkerOptionsRelation="1" />
- <Linker>
- <Add library="boost_program_options-mt-s" />
- <Add library="boost_filesystem-mt-s" />
- <Add library="boost_regex-mt-s" />
- <Add library="/usr/i486-mingw32/lib/libSDL.dll.a" />
- </Linker>
- </Target>
- </Build>
- <Compiler>
- <Add option="-Wall" />
- <Add option="`sdl-config --cflags`" />
- </Compiler>
- <Linker>
- <Add option="`sdl-config --libs`" />
- <Add library="boost_program_options-mt" />
- <Add library="boost_filesystem-mt" />
- <Add library="boost_regex-mt" />
- </Linker>
- <Unit filename="cb.bmp" />
- <Unit filename="main.cpp" />
- <Extensions>
- <code_completion />
- <envvars />
- <lib_finder disable_auto="1" />
- <debugger />
- </Extensions>
- </Project>
-</CodeBlocks_project_file>
View
@@ -1,213 +0,0 @@
-# depslib dependency file v1.0
-1245058869 source:/home/svenstaro/mystuff/c++/infinerator/main.cpp
- <cstdlib>
- <stdlib.h>
- <SDL/SDL.h>
- <SDL.h>
- <iostream>
- <iterator>
- <vector>
- <string>
- <boost/foreach.hpp>
- <boost/program_options.hpp>
- <boost/lexical_cast.hpp>
- <boost/regex.hpp>
-
-1224507098 /usr/include/SDL/SDL.h
- "SDL_main.h"
- "SDL_stdinc.h"
- "SDL_audio.h"
- "SDL_cdrom.h"
- "SDL_cpuinfo.h"
- "SDL_endian.h"
- "SDL_error.h"
- "SDL_events.h"
- "SDL_loadso.h"
- "SDL_mutex.h"
- "SDL_rwops.h"
- "SDL_thread.h"
- "SDL_timer.h"
- "SDL_video.h"
- "SDL_version.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_main.h
- "SDL_stdinc.h"
- "begin_code.h"
- "close_code.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_stdinc.h
- "SDL_config.h"
- <sys/types.h>
- <stdio.h>
- <stdlib.h>
- <stddef.h>
- <stdarg.h>
- <stdlib.h>
- <malloc.h>
- <stddef.h>
- <stdarg.h>
- <memory.h>
- <string.h>
- <strings.h>
- <inttypes.h>
- <stdint.h>
- <ctype.h>
- <iconv.h>
- "begin_code.h"
- <alloca.h>
- <malloc.h>
- <malloc.h>
- <malloc.h>
- <stdlib.h>
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_config.h
- "SDL_platform.h"
- <stdarg.h>
-
-1224507098 /usr/include/SDL/SDL_platform.h
-
-1224507098 /usr/include/SDL/begin_code.h
-
-1224507098 /usr/include/SDL/close_code.h
-
-1224507098 /usr/include/SDL/SDL_audio.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "SDL_endian.h"
- "SDL_mutex.h"
- "SDL_thread.h"
- "SDL_rwops.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_error.h
- "SDL_stdinc.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_endian.h
- "SDL_stdinc.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_mutex.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_thread.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "SDL_mutex.h"
- "begin_code.h"
- <process.h>
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_rwops.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_cdrom.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_cpuinfo.h
- "SDL_stdinc.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_events.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "SDL_active.h"
- "SDL_keyboard.h"
- "SDL_mouse.h"
- "SDL_joystick.h"
- "SDL_quit.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_active.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_keyboard.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "SDL_keysym.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_keysym.h
-
-1224507098 /usr/include/SDL/SDL_mouse.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "SDL_video.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_video.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "SDL_rwops.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_joystick.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_quit.h
- "SDL_stdinc.h"
- "SDL_error.h"
-
-1224507098 /usr/include/SDL/SDL_loadso.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_timer.h
- "SDL_stdinc.h"
- "SDL_error.h"
- "begin_code.h"
- "close_code.h"
-
-1224507098 /usr/include/SDL/SDL_version.h
- "SDL_stdinc.h"
- "begin_code.h"
- "close_code.h"
-
-1247528747 source:/home/svenstaro/pythonag/infinerator/main.cpp
- <cstdlib>
- <stdlib.h>
- <SDL/SDL.h>
- <SDL/SDL.h>
- <SDL.h>
- <math.h>
- <iostream>
- <iterator>
- <vector>
- <string>
- <cassert>
- <boost/multi_array.hpp>
- <boost/foreach.hpp>
- <boost/program_options.hpp>
- <boost/lexical_cast.hpp>
- <boost/regex.hpp>
-
View
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
- <ActiveTarget name="Release" />
- <File name="main.cpp" open="1" top="1" tabpos="1">
- <Cursor position="7043" topLine="0" />
- </File>
-</CodeBlocks_layout_file>
View
Binary file not shown.
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
- <Workspace title="Workspace">
- <Project filename="infinerator.cbp" active="1" />
- </Workspace>
-</CodeBlocks_workspace_file>
View
@@ -11,20 +11,17 @@
#include <SDL.h>
#endif
-#include <math.h>
+#include <cassert>
+#include <cmath>
#include <iostream>
#include <iterator>
-#include <vector>
#include <string>
-#include <cassert>
+#include <vector>
#include <boost/multi_array.hpp>
-#include <boost/foreach.hpp>
+#include <boost/regex.hpp>
#include <boost/program_options.hpp>
#include <boost/lexical_cast.hpp>
-#include <boost/regex.hpp>
-
-#define foreach BOOST_FOREACH
namespace po = boost::program_options;
using namespace std;

0 comments on commit f56a7ab

Please sign in to comment.